Skip to content

Commit 25a4be5

Browse files
clang-format changes for ifdef changes
1 parent 40b9cea commit 25a4be5

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
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

0 commit comments

Comments
 (0)