Skip to content

Commit 08974e8

Browse files
zoecarverzoecarver
committed
[nfc] Clang format (again).
1 parent aedaab2 commit 08974e8

File tree

14 files changed

+44
-56
lines changed

14 files changed

+44
-56
lines changed

‎lib/ClangImporter/ImportDecl.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1974,8 +1974,7 @@ namespace {
19741974
// Recursively checks that there are no pointers, user-provided copy
19751975
// constructors, or destructors in any fields or base classes.
19761976
static bool isSufficientlyTrivial(const clang::CXXRecordDecl *decl) {
1977-
if (hasImportAsRefAttr(decl) ||
1978-
hasOwnedValueAttr(decl) ||
1977+
if (hasImportAsRefAttr(decl) || hasOwnedValueAttr(decl) ||
19791978
hasUnsafeAPIAttr(decl))
19801979
return true;
19811980

@@ -2032,7 +2031,7 @@ namespace {
20322031
return false;
20332032

20342033
if (hasOwnedValueAttr(decl) || hasUnsafeAPIAttr(decl)) // ||
2035-
// some build mode)
2034+
// some build mode)
20362035
return true;
20372036

20382037
return isSufficientlyTrivial(decl);

‎lib/Sema/TypeCheckAvailability.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@ bool TypeChecker::isDeclarationUnavailable(
13501350
static bool allowEagerUnsafeCxxAPIs(const Decl *decl,
13511351
const AvailableAttr *attr) {
13521352
return true; // decl->hasClangNode() && decl->getASTContext().someBuildMode &&
1353-
// attr->Message == "unsafe-api";
1353+
// attr->Message == "unsafe-api";
13541354
}
13551355

13561356
Optional<UnavailabilityReason>

‎test/Interop/Cxx/class/Inputs/constructors.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ struct TemplatedConstructorWithExtraArg {
6363
TemplatedConstructorWithExtraArg(T value, U other) { }
6464
};
6565

66-
struct
67-
__attribute__((swift_attr("import_unsafe_api")))
66+
struct __attribute__((swift_attr("import_unsafe_api")))
6867
HasUserProvidedCopyConstructor {
6968
int numCopies;
7069
HasUserProvidedCopyConstructor(int numCopies = 0) : numCopies(numCopies) {}

‎test/Interop/Cxx/class/Inputs/destructors.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33

44
struct DummyStruct {};
55

6-
struct
7-
__attribute__((swift_attr("import_unsafe_api")))
6+
struct __attribute__((swift_attr("import_unsafe_api")))
87
HasUserProvidedDestructorAndDummy {
98
DummyStruct dummy;
109
~HasUserProvidedDestructorAndDummy() {}
1110
};
1211

13-
struct
14-
__attribute__((swift_attr("import_unsafe_api")))
12+
struct __attribute__((swift_attr("import_unsafe_api")))
1513
HasUserProvidedDestructor {
1614
int *value;
1715
~HasUserProvidedDestructor() { *value = 42; }

‎test/Interop/Cxx/class/Inputs/protocol-conformance.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,14 @@ struct Trivial {
2929
};
3030

3131
struct ReturnsNullableValue {
32-
const int *returnPointer() __attribute__((swift_attr("import_unsafe_api"))) { return nullptr; }
32+
const int *returnPointer() __attribute__((swift_attr("import_unsafe_api"))) {
33+
return nullptr;
34+
}
3335
};
3436

3537
struct ReturnsNonNullValue {
36-
const int *returnPointer() __attribute__((returns_nonnull)) __attribute__((swift_attr("import_unsafe_api"))) {
38+
const int *returnPointer() __attribute__((returns_nonnull))
39+
__attribute__((swift_attr("import_unsafe_api"))) {
3740
return (int *)this;
3841
}
3942
};

‎test/Interop/Cxx/class/Inputs/type-classification.h

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ struct StructWithAdditionalConstructor {
1414
StructWithAdditionalConstructor(int parameter) {}
1515
};
1616

17-
struct
18-
__attribute__((swift_attr("import_unsafe_api")))
17+
struct __attribute__((swift_attr("import_unsafe_api")))
1918
StructWithCopyConstructor {
2019
StructWithCopyConstructor(const StructWithCopyConstructor &) {}
2120
};
@@ -61,8 +60,7 @@ struct StructWithSubobjectMoveConstructor {
6160
StructWithMoveConstructor subobject;
6261
};
6362

64-
struct
65-
__attribute__((swift_attr("import_unsafe_api")))
63+
struct __attribute__((swift_attr("import_unsafe_api")))
6664
StructWithCopyAssignment {
6765
StructWithCopyAssignment &operator=(const StructWithCopyAssignment &);
6866
};
@@ -83,9 +81,7 @@ struct StructWithSubobjectMoveAssignment {
8381
StructWithMoveAssignment subobject;
8482
};
8583

86-
struct
87-
__attribute__((swift_attr("import_unsafe_api")))
88-
StructWithDestructor {
84+
struct __attribute__((swift_attr("import_unsafe_api"))) StructWithDestructor {
8985
~StructWithDestructor() {}
9086
};
9187

@@ -172,8 +168,7 @@ struct StructDeletedDestructor {
172168
~StructDeletedDestructor() = delete;
173169
};
174170

175-
struct
176-
__attribute__((swift_attr("import_owned_value")))
171+
struct __attribute__((swift_attr("import_owned_value")))
177172
StructWithCopyConstructorAndValue {
178173
int value;
179174
StructWithCopyConstructorAndValue() : value(0) {}
@@ -187,8 +182,7 @@ struct StructWithSubobjectCopyConstructorAndValue {
187182
StructWithCopyConstructorAndValue member;
188183
};
189184

190-
struct
191-
__attribute__((swift_attr("import_owned_value")))
185+
struct __attribute__((swift_attr("import_owned_value")))
192186
StructWithCopyConstructorAndSubobjectCopyConstructorAndValue {
193187
StructWithCopyConstructorAndValue member;
194188
StructWithCopyConstructorAndSubobjectCopyConstructorAndValue(

‎test/Interop/Cxx/class/inheritance/Inputs/fields.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ struct __attribute__((swift_attr("import_unsafe_api"))) NonTrivialHasOneField {
4040
int e = 5;
4141
};
4242

43-
struct
44-
__attribute__((swift_attr("import_unsafe_api")))
45-
NonTrivialDerivedFromAll : NonTrivialHasOneField, NonTrivialDerivedWithOneField {
43+
struct __attribute__((swift_attr("import_unsafe_api"))) NonTrivialDerivedFromAll
44+
: NonTrivialHasOneField,
45+
NonTrivialDerivedWithOneField {
4646
int f = 6;
4747
};
4848

‎test/Interop/Cxx/class/inheritance/Inputs/functions.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ struct DerivedFromDerived : Derived {
7474
}
7575
};
7676

77-
struct __attribute__((swift_attr("import_unsafe_api"))) DerivedFromNonTrivial : NonTrivial {};
77+
struct __attribute__((swift_attr("import_unsafe_api"))) DerivedFromNonTrivial
78+
: NonTrivial {};
7879

7980
struct EmptyBaseClass {
8081
const char *inBase() const __attribute__((swift_attr("import_unsafe_api"))) {

‎test/Interop/Cxx/foreign-reference/Inputs/move-only.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ struct __attribute__((swift_attr("import_foreign_reference"))) NoCopyMove {
4545
}
4646
};
4747

48-
struct __attribute__((swift_attr("import_foreign_reference"))) HasMoveOnlyChild {
48+
struct __attribute__((swift_attr("import_foreign_reference")))
49+
HasMoveOnlyChild {
4950
MoveOnly child;
5051

5152
static HasMoveOnlyChild *create() {

‎test/Interop/Cxx/operators/Inputs/member-inline.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,7 @@ struct ReadWriteIntArray {
112112
};
113113
};
114114

115-
struct
116-
__attribute__((swift_attr("import_owned_value")))
117-
ReadOnlyIntArray {
115+
struct __attribute__((swift_attr("import_owned_value"))) ReadOnlyIntArray {
118116
private:
119117
int values[5] = { 1, 2, 3, 4, 5 };
120118

@@ -176,7 +174,8 @@ struct TemplatedArray {
176174
};
177175
typedef TemplatedArray<double> TemplatedDoubleArray;
178176

179-
struct __attribute__((swift_attr("import_unsafe_api"))) TemplatedSubscriptArray {
177+
struct __attribute__((swift_attr("import_unsafe_api")))
178+
TemplatedSubscriptArray {
180179
int *ptr;
181180

182181
template<class T>
@@ -197,8 +196,7 @@ struct IntArrayByVal {
197196
int values[3] = { 1, 2, 3 };
198197
};
199198

200-
struct
201-
__attribute__((swift_attr("import_owned_value")))
199+
struct __attribute__((swift_attr("import_owned_value")))
202200
NonTrivialIntArrayByVal {
203201
NonTrivialIntArrayByVal(int first) { values[0] = first; }
204202
NonTrivialIntArrayByVal(const NonTrivialIntArrayByVal &other) {
@@ -241,7 +239,8 @@ struct TemplatedByVal {
241239
}
242240
};
243241

244-
struct __attribute__((swift_attr("import_unsafe_api"))) TemplatedOperatorArrayByVal {
242+
struct __attribute__((swift_attr("import_unsafe_api")))
243+
TemplatedOperatorArrayByVal {
245244
int *ptr;
246245
template<class T> T operator[](T i) { return ptr[i]; }
247246
template <class T>

‎test/Interop/Cxx/operators/Inputs/member-out-of-line.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ struct ReadWriteIntArray {
2929
int &operator[](int x);
3030
};
3131

32-
struct __attribute__((swift_attr("import_owned_value"))) NonTrivialIntArrayByVal {
32+
struct __attribute__((swift_attr("import_owned_value")))
33+
NonTrivialIntArrayByVal {
3334
NonTrivialIntArrayByVal(int first) { values[0] = first; }
3435
NonTrivialIntArrayByVal(const NonTrivialIntArrayByVal &other) {
3536
for (int i = 0; i < 5; i++)

‎test/Interop/Cxx/templates/Inputs/define-referenced-inline.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inline void inlineFn2(T) { }
99

1010
inline void inlineFn3() { }
1111

12-
template<class T>
12+
template <class T>
1313
struct __attribute__((swift_attr("import_unsafe_api"))) HasInlineDtor {
1414
inline ~HasInlineDtor() { inlineFn1(T()); }
1515
};

‎test/Interop/Cxx/value-witness-table/Inputs/copy-constructors.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#ifndef TEST_INTEROP_CXX_VALUE_WITNESS_TABLE_INPUTS_COPY_CONSTRUCTORS_H
22
#define TEST_INTEROP_CXX_VALUE_WITNESS_TABLE_INPUTS_COPY_CONSTRUCTORS_H
33

4-
struct
5-
__attribute__((swift_attr("import_unsafe_api")))
4+
struct __attribute__((swift_attr("import_unsafe_api")))
65
HasUserProvidedCopyConstructor {
76
int numCopies;
87
HasUserProvidedCopyConstructor(int numCopies = 0) : numCopies(numCopies) {}

‎test/Interop/Cxx/value-witness-table/Inputs/custom-destructors.h

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#ifndef TEST_INTEROP_CXX_VALUE_WITNESS_TABLE_INPUTS_CUSTOM_DESTRUCTORS_H
22
#define TEST_INTEROP_CXX_VALUE_WITNESS_TABLE_INPUTS_CUSTOM_DESTRUCTORS_H
33

4-
struct __attribute__((swift_attr("import_unsafe_api"))) HasUserProvidedDestructor {
4+
struct __attribute__((swift_attr("import_unsafe_api")))
5+
HasUserProvidedDestructor {
56
int *value;
67
~HasUserProvidedDestructor() { *value = 42; }
78
};
89

9-
struct
10-
__attribute__((swift_attr("import_unsafe_api")))
10+
struct __attribute__((swift_attr("import_unsafe_api")))
1111
HasEmptyDestructorAndMemberWithUserDefinedConstructor {
1212
HasUserProvidedDestructor member;
1313
~HasEmptyDestructorAndMemberWithUserDefinedConstructor() { /* empty */
@@ -32,41 +32,35 @@ struct HasDefaultedDestructor {
3232
// the linker will error because of undefined vtables.
3333
// FIXME: Once we can link with libc++ we can enable RTTI.
3434

35-
struct
36-
__attribute__((swift_attr("import_unsafe_api")))
35+
struct __attribute__((swift_attr("import_unsafe_api")))
3736
HasVirtualBaseAndDestructor : virtual HasDefaultedDestructor {
3837
int *value;
3938
HasVirtualBaseAndDestructor(int *value) : value(value) {}
4039
~HasVirtualBaseAndDestructor() { *value = 42; }
4140
};
4241

43-
struct
44-
__attribute__((swift_attr("import_unsafe_api")))
45-
HasVirtualDestructor {
42+
struct __attribute__((swift_attr("import_unsafe_api"))) HasVirtualDestructor {
4643
// An object with a virtual destructor requires a delete operator in case
4744
// we try to delete the base object. Until we can link against libc++, use
4845
// this dummy implementation.
4946
static void operator delete(void *p) { __builtin_unreachable(); }
5047
virtual ~HasVirtualDestructor(){};
5148
};
5249

53-
struct
54-
__attribute__((swift_attr("import_unsafe_api")))
50+
struct __attribute__((swift_attr("import_unsafe_api")))
5551
HasVirtualDefaultedDestructor {
5652
static void operator delete(void *p) { __builtin_unreachable(); }
5753
virtual ~HasVirtualDefaultedDestructor() = default;
5854
};
5955

60-
struct
61-
__attribute__((swift_attr("import_unsafe_api")))
56+
struct __attribute__((swift_attr("import_unsafe_api")))
6257
HasBaseWithVirtualDestructor : HasVirtualDestructor {
6358
int *value;
6459
HasBaseWithVirtualDestructor(int *value) : value(value) {}
6560
~HasBaseWithVirtualDestructor() { *value = 42; }
6661
};
6762

68-
struct
69-
__attribute__((swift_attr("import_unsafe_api")))
63+
struct __attribute__((swift_attr("import_unsafe_api")))
7064
HasVirtualBaseWithVirtualDestructor : virtual HasVirtualDestructor {
7165
int *value;
7266
HasVirtualBaseWithVirtualDestructor(int *value) : value(value) {}
@@ -75,15 +69,15 @@ HasVirtualBaseWithVirtualDestructor : virtual HasVirtualDestructor {
7569

7670
struct DummyStruct {};
7771

78-
struct
79-
__attribute__((swift_attr("import_unsafe_api")))
72+
struct __attribute__((swift_attr("import_unsafe_api")))
8073
HasUserProvidedDestructorAndDummy {
8174
DummyStruct dummy;
8275
~HasUserProvidedDestructorAndDummy() {}
8376
};
8477

8578
// Make sure that we don't crash on struct templates with destructors.
86-
template <typename T> struct __attribute__((swift_attr("import_unsafe_api"))) S {
79+
template <typename T>
80+
struct __attribute__((swift_attr("import_unsafe_api"))) S {
8781
~S() {}
8882
};
8983

0 commit comments

Comments
 (0)