Skip to content

Commit 394c5bc

Browse files
committed
[interop] fix tests after fixing private annotations on the 'swift' namespace
1 parent cf0763d commit 394c5bc

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

test/Interop/CxxToSwiftToCxx/bridge-cxx-struct-back-to-cxx.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
166166

167167
// CHECK: } // end namespace
168168
// CHECK-EMPTY:
169-
// CHECK-NEXT: namespace swift {
169+
// CHECK-NEXT: namespace swift SWIFT_PRIVATE_ATTR {
170170
// CHECK-NEXT: namespace _impl {
171171
// CHECK-EMPTY:
172172
// CHECK-NEXT: // Type metadata accessor for NonTrivialTemplateInt
@@ -205,7 +205,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
205205
// CHECK-EMPTY:
206206
// CHECK-NEXT: } // end namespace
207207
// CHECK-EMPTY:
208-
// CHECK-NEXT: namespace swift {
208+
// CHECK-NEXT: namespace swift SWIFT_PRIVATE_ATTR {
209209
// CHECK-NEXT: namespace _impl {
210210
// CHECK-EMPTY:
211211
// CHECK-NEXT: // Type metadata accessor for NonTrivialTemplateTrivial

test/Interop/SwiftToCxx/class/swift-class-in-cxx.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public final class ClassWithIntField {
3434
// CHECK-NEXT: } // end namespace
3535

3636
// CHECK: namespace
37-
// CHECK-SAME: swift {
37+
// CHECK-SAME: swift SWIFT_PRIVATE_ATTR {
3838
// CHECK-NEXT: #pragma clang diagnostic push
3939
// CHECK-NEXT: #pragma clang diagnostic ignored "-Wc++17-extensions"
4040
// CHECK-NEXT: template<>
@@ -84,7 +84,7 @@ public final class ClassWithIntField {
8484
// CHECK-EMPTY:
8585
// CHECK-NEXT: } // end namespace
8686
// CHECK-EMPTY:
87-
// CHECK-NEXT: namespace swift {
87+
// CHECK-NEXT: namespace swift SWIFT_PRIVATE_ATTR {
8888
// CHECK-NEXT: #pragma clang diagnostic push
8989
// CHECK-NEXT: #pragma clang diagnostic ignored "-Wc++17-extensions"
9090
// CHECK-NEXT: template<>

test/Interop/SwiftToCxx/generics/generic-struct-in-cxx.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public func inoutConcretePair(_ x: UInt16, _ y: inout GenericPair<UInt16, UInt16
261261
// CHECK-NEXT: return result;
262262
// CHECK-NEXT: }
263263

264-
// CHECK: namespace swift {
264+
// CHECK: namespace swift SWIFT_PRIVATE_ATTR {
265265
// CHECK-NEXT: #pragma clang diagnostic push
266266
// CHECK-NEXT: #pragma clang diagnostic ignored "-Wc++17-extensions"
267267
// CHECK-NEXT: template<class T_0_0, class T_0_1>

test/Interop/SwiftToCxx/structs/resilient-struct-in-cxx.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public struct FirstSmallStruct {
8080
// CHECK-EMPTY:
8181
// CHECK-NEXT: } // end namespace
8282
// CHECK-EMPTY:
83-
// CHECK-NEXT: namespace swift {
83+
// CHECK-NEXT: namespace swift SWIFT_PRIVATE_ATTR {
8484
// CHECK-NEXT: #pragma clang diagnostic push
8585
// CHECK-NEXT: #pragma clang diagnostic ignored "-Wc++17-extensions"
8686
// CHECK-NEXT: template<>

test/Interop/SwiftToCxx/structs/swift-struct-in-cxx.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// CHECK: class SWIFT_SYMBOL("s:7Structs18StructWithIntFieldV") StructWithIntField;
1313
// CHECK-NEXT: } // end namespace
1414

15-
// CHECK: namespace swift {
15+
// CHECK: namespace swift SWIFT_PRIVATE_ATTR {
1616
// CHECK-NEXT: #pragma clang diagnostic push
1717
// CHECK-NEXT: #pragma clang diagnostic ignored "-Wc++17-extensions"
1818
// CHECK-NEXT: template<>
@@ -85,7 +85,7 @@
8585
// CHECK-EMPTY:
8686
// CHECK-NEXT: } // end namespace
8787
// CHECK-EMPTY:
88-
// CHECK-NEXT: namespace swift {
88+
// CHECK-NEXT: namespace swift SWIFT_PRIVATE_ATTR {
8989
// CHECK-NEXT: #pragma clang diagnostic push
9090
// CHECK-NEXT: #pragma clang diagnostic ignored "-Wc++17-extensions"
9191
// CHECK-NEXT: template<>

0 commit comments

Comments
 (0)