Skip to content

[lldb][AIX] clang-format changes for some basic #if _AIX changes #120978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ bool ConnectionFileDescriptor::IsConnected() const {

ConnectionStatus ConnectionFileDescriptor::Connect(llvm::StringRef path,
Status *error_ptr) {
return Connect(
path, [](llvm::StringRef) {}, error_ptr);
return Connect(path, [](llvm::StringRef) {}, error_ptr);
}

ConnectionStatus
Expand Down
3 changes: 2 additions & 1 deletion lldb/source/Host/posix/DomainSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ Status DomainSocket::Connect(llvm::StringRef name) {
if (error.Fail())
return error;
if (llvm::sys::RetryAfterSignal(-1, ::connect, GetNativeSocket(),
(struct sockaddr *)&saddr_un, saddr_un_len) < 0)
(struct sockaddr *)&saddr_un,
saddr_un_len) < 0)
SetLastError(error);

return error;
Expand Down
13 changes: 6 additions & 7 deletions lldb/source/Plugins/Language/ObjC/Cocoa.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "llvm/ADT/APInt.h"
#include "llvm/ADT/bit.h"


using namespace lldb;
using namespace lldb_private;
using namespace lldb_private::formatters;
Expand Down Expand Up @@ -267,21 +266,21 @@ bool lldb_private::formatters::NSIndexSetSummaryProvider(
if (class_name == "NSIndexSet" || class_name == "NSMutableIndexSet") {
// Foundation version 2000 added a bitmask if the index set fit in 64 bits
// and a Tagged Pointer version if the bitmask is small enough to fit in
// the tagged pointer payload.
// the tagged pointer payload.
// It also changed the layout (but not the size) of the set descriptor.

// First check whether this is a tagged pointer. The bitmask will be in
// the payload of the tagged pointer.
uint64_t payload;
if (runtime->GetFoundationVersion() >= 2000
&& descriptor->GetTaggedPointerInfo(nullptr, nullptr, &payload)) {
if (runtime->GetFoundationVersion() >= 2000 &&
descriptor->GetTaggedPointerInfo(nullptr, nullptr, &payload)) {
count = llvm::popcount(payload);
break;
}
// The first 32 bits describe the index set in all cases:
Status error;
uint32_t mode = process_sp->ReadUnsignedIntegerFromMemory(
valobj_addr + ptr_size, 4, 0, error);
valobj_addr + ptr_size, 4, 0, error);
if (error.Fail())
return false;
// Now check if the index is held in a bitmask in the object:
Expand All @@ -292,7 +291,7 @@ bool lldb_private::formatters::NSIndexSetSummaryProvider(
if ((mode & 2) == 2) {
// The bitfield is a 64 bit uint at the beginning of the data var.
uint64_t bitfield = process_sp->ReadUnsignedIntegerFromMemory(
valobj_addr + 2 * ptr_size, 8, 0, error);
valobj_addr + 2 * ptr_size, 8, 0, error);
if (error.Fail())
return false;
count = llvm::popcount(bitfield);
Expand All @@ -309,7 +308,7 @@ bool lldb_private::formatters::NSIndexSetSummaryProvider(
count = 0;
break;
}

if ((mode & 2) == 2)
mode = 1; // this means the set only has one range
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ size_t ObjectContainerBSDArchive::Archive::ParseObjects() {

std::unique_ptr<llvm::MemoryBuffer> mem_buffer =
llvm::MemoryBuffer::getMemBuffer(
llvm::StringRef((const char *)data.GetDataStart(),
data.GetByteSize()),
llvm::StringRef(),
/*RequiresNullTerminator=*/false);
llvm::StringRef((const char *)data.GetDataStart(),
data.GetByteSize()),
llvm::StringRef(),
/*RequiresNullTerminator=*/false);

auto exp_ar = llvm::object::Archive::create(mem_buffer->getMemBufferRef());
if (!exp_ar) {
Expand All @@ -95,7 +95,7 @@ size_t ObjectContainerBSDArchive::Archive::ParseObjects() {

llvm::Error iter_err = llvm::Error::success();
Object obj;
for (const auto &child: llvm_archive->children(iter_err)) {
for (const auto &child : llvm_archive->children(iter_err)) {
obj.Clear();
auto exp_name = child.getName();
if (exp_name) {
Expand All @@ -111,7 +111,9 @@ size_t ObjectContainerBSDArchive::Archive::ParseObjects() {
obj.modification_time =
std::chrono::duration_cast<std::chrono::seconds>(
std::chrono::time_point_cast<std::chrono::seconds>(
exp_mtime.get()).time_since_epoch()).count();
exp_mtime.get())
.time_since_epoch())
.count();
} else {
LLDB_LOG_ERROR(l, exp_mtime.takeError(),
"failed to get archive object time: {0}");
Expand Down Expand Up @@ -331,21 +333,21 @@ ObjectContainer *ObjectContainerBSDArchive::CreateInstance(
ArchiveType
ObjectContainerBSDArchive::MagicBytesMatch(const DataExtractor &data) {
uint32_t offset = 0;
const char *armag = (const char *)data.PeekData(offset,
sizeof(ar_hdr) + SARMAG);
const char *armag =
(const char *)data.PeekData(offset, sizeof(ar_hdr) + SARMAG);
if (armag == nullptr)
return ArchiveType::Invalid;
ArchiveType result = ArchiveType::Invalid;
if (strncmp(armag, ArchiveMagic, SARMAG) == 0)
result = ArchiveType::Archive;
result = ArchiveType::Archive;
else if (strncmp(armag, ThinArchiveMagic, SARMAG) == 0)
result = ArchiveType::ThinArchive;
result = ArchiveType::ThinArchive;
else
return ArchiveType::Invalid;
return ArchiveType::Invalid;

armag += offsetof(struct ar_hdr, ar_fmag) + SARMAG;
if (strncmp(armag, ARFMAG, 2) == 0)
return result;
return result;
return ArchiveType::Invalid;
}

Expand Down Expand Up @@ -443,7 +445,8 @@ size_t ObjectContainerBSDArchive::GetModuleSpecifications(
return 0;

const size_t initial_count = specs.GetSize();
llvm::sys::TimePoint<> file_mod_time = FileSystem::Instance().GetModificationTime(file);
llvm::sys::TimePoint<> file_mod_time =
FileSystem::Instance().GetModificationTime(file);
Archive::shared_ptr archive_sp(
Archive::FindCachedArchive(file, ArchSpec(), file_mod_time, file_offset));
bool set_archive_arch = false;
Expand Down
Loading