Skip to content

Commit 1ead155

Browse files
[lldb] clang-format changes for some basic #if _AIX changes (#120978)
This PR is in reference to porting LLDB on AIX. Link to discussions on llvm discourse and github: 1. https://discourse.llvm.org/t/port-lldb-to-ibm-aix/80640 2. #101657 The complete changes for porting are present in this draft PR: #102601 Added clang-format changes for changes related to some base #if _AIX changes: - #120979
1 parent 2b5b3cf commit 1ead155

File tree

4 files changed

+25
-23
lines changed

4 files changed

+25
-23
lines changed

lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ bool ConnectionFileDescriptor::IsConnected() const {
119119

120120
ConnectionStatus ConnectionFileDescriptor::Connect(llvm::StringRef path,
121121
Status *error_ptr) {
122-
return Connect(
123-
path, [](llvm::StringRef) {}, error_ptr);
122+
return Connect(path, [](llvm::StringRef) {}, error_ptr);
124123
}
125124

126125
ConnectionStatus

lldb/source/Host/posix/DomainSocket.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ Status DomainSocket::Connect(llvm::StringRef name) {
8686
if (error.Fail())
8787
return error;
8888
if (llvm::sys::RetryAfterSignal(-1, ::connect, GetNativeSocket(),
89-
(struct sockaddr *)&saddr_un, saddr_un_len) < 0)
89+
(struct sockaddr *)&saddr_un,
90+
saddr_un_len) < 0)
9091
SetLastError(error);
9192

9293
return error;

lldb/source/Plugins/Language/ObjC/Cocoa.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "llvm/ADT/APInt.h"
3232
#include "llvm/ADT/bit.h"
3333

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

273272
// First check whether this is a tagged pointer. The bitmask will be in
274273
// the payload of the tagged pointer.
275274
uint64_t payload;
276-
if (runtime->GetFoundationVersion() >= 2000
277-
&& descriptor->GetTaggedPointerInfo(nullptr, nullptr, &payload)) {
275+
if (runtime->GetFoundationVersion() >= 2000 &&
276+
descriptor->GetTaggedPointerInfo(nullptr, nullptr, &payload)) {
278277
count = llvm::popcount(payload);
279278
break;
280279
}
281280
// The first 32 bits describe the index set in all cases:
282281
Status error;
283282
uint32_t mode = process_sp->ReadUnsignedIntegerFromMemory(
284-
valobj_addr + ptr_size, 4, 0, error);
283+
valobj_addr + ptr_size, 4, 0, error);
285284
if (error.Fail())
286285
return false;
287286
// Now check if the index is held in a bitmask in the object:
@@ -292,7 +291,7 @@ bool lldb_private::formatters::NSIndexSetSummaryProvider(
292291
if ((mode & 2) == 2) {
293292
// The bitfield is a 64 bit uint at the beginning of the data var.
294293
uint64_t bitfield = process_sp->ReadUnsignedIntegerFromMemory(
295-
valobj_addr + 2 * ptr_size, 8, 0, error);
294+
valobj_addr + 2 * ptr_size, 8, 0, error);
296295
if (error.Fail())
297296
return false;
298297
count = llvm::popcount(bitfield);
@@ -309,7 +308,7 @@ bool lldb_private::formatters::NSIndexSetSummaryProvider(
309308
count = 0;
310309
break;
311310
}
312-
311+
313312
if ((mode & 2) == 2)
314313
mode = 1; // this means the set only has one range
315314
else

lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ size_t ObjectContainerBSDArchive::Archive::ParseObjects() {
8181

8282
std::unique_ptr<llvm::MemoryBuffer> mem_buffer =
8383
llvm::MemoryBuffer::getMemBuffer(
84-
llvm::StringRef((const char *)data.GetDataStart(),
85-
data.GetByteSize()),
86-
llvm::StringRef(),
87-
/*RequiresNullTerminator=*/false);
84+
llvm::StringRef((const char *)data.GetDataStart(),
85+
data.GetByteSize()),
86+
llvm::StringRef(),
87+
/*RequiresNullTerminator=*/false);
8888

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

9696
llvm::Error iter_err = llvm::Error::success();
9797
Object obj;
98-
for (const auto &child: llvm_archive->children(iter_err)) {
98+
for (const auto &child : llvm_archive->children(iter_err)) {
9999
obj.Clear();
100100
auto exp_name = child.getName();
101101
if (exp_name) {
@@ -111,7 +111,9 @@ size_t ObjectContainerBSDArchive::Archive::ParseObjects() {
111111
obj.modification_time =
112112
std::chrono::duration_cast<std::chrono::seconds>(
113113
std::chrono::time_point_cast<std::chrono::seconds>(
114-
exp_mtime.get()).time_since_epoch()).count();
114+
exp_mtime.get())
115+
.time_since_epoch())
116+
.count();
115117
} else {
116118
LLDB_LOG_ERROR(l, exp_mtime.takeError(),
117119
"failed to get archive object time: {0}");
@@ -331,21 +333,21 @@ ObjectContainer *ObjectContainerBSDArchive::CreateInstance(
331333
ArchiveType
332334
ObjectContainerBSDArchive::MagicBytesMatch(const DataExtractor &data) {
333335
uint32_t offset = 0;
334-
const char *armag = (const char *)data.PeekData(offset,
335-
sizeof(ar_hdr) + SARMAG);
336+
const char *armag =
337+
(const char *)data.PeekData(offset, sizeof(ar_hdr) + SARMAG);
336338
if (armag == nullptr)
337339
return ArchiveType::Invalid;
338340
ArchiveType result = ArchiveType::Invalid;
339341
if (strncmp(armag, ArchiveMagic, SARMAG) == 0)
340-
result = ArchiveType::Archive;
342+
result = ArchiveType::Archive;
341343
else if (strncmp(armag, ThinArchiveMagic, SARMAG) == 0)
342-
result = ArchiveType::ThinArchive;
344+
result = ArchiveType::ThinArchive;
343345
else
344-
return ArchiveType::Invalid;
346+
return ArchiveType::Invalid;
345347

346348
armag += offsetof(struct ar_hdr, ar_fmag) + SARMAG;
347349
if (strncmp(armag, ARFMAG, 2) == 0)
348-
return result;
350+
return result;
349351
return ArchiveType::Invalid;
350352
}
351353

@@ -443,7 +445,8 @@ size_t ObjectContainerBSDArchive::GetModuleSpecifications(
443445
return 0;
444446

445447
const size_t initial_count = specs.GetSize();
446-
llvm::sys::TimePoint<> file_mod_time = FileSystem::Instance().GetModificationTime(file);
448+
llvm::sys::TimePoint<> file_mod_time =
449+
FileSystem::Instance().GetModificationTime(file);
447450
Archive::shared_ptr archive_sp(
448451
Archive::FindCachedArchive(file, ArchSpec(), file_mod_time, file_offset));
449452
bool set_archive_arch = false;

0 commit comments

Comments
 (0)