Skip to content

Commit 2d54f90

Browse files
committed
Adjust tests to account for presence of implicit import of '_SwiftConcurrencyShims'
1 parent afb508f commit 2d54f90

File tree

7 files changed

+241
-258
lines changed

7 files changed

+241
-258
lines changed

test/Constraints/overload.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func f4(_ j: Wibble) { } // expected-error{{cannot find type 'Wibble' in scope}}
9292
f4(5)
9393

9494
func f1() {
95-
var c : Class // expected-error{{cannot find type 'Class' in scope}}
95+
var c : Klass // expected-error{{cannot find type 'Klass' in scope}}
9696
markUsed(c.x) // make sure error does not cascade here
9797
}
9898

test/DebugInfo/InlineBridgingHeader.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
// RUN: -emit-ir -g %s -o - | %FileCheck %s
44

55
// The Swift CU must come first.
6-
// CHECK: !llvm.dbg.cu = !{![[SWIFT_CU:[0-9]+]], ![[CLANG_CU:[0-9]+]]}
6+
// CHECK: !llvm.dbg.cu = !{![[SWIFT_CU:[0-9]+]], ![[CLANG_CU:[0-9]+]], ![[CONCURRENCY_SHIMS_CU:[0-9]+]]}
77
// CHECK: ![[SWIFT_CU]] = distinct !DICompileUnit(language: DW_LANG_Swift
88
// CHECK: ![[CLANG_CU]] = distinct !DICompileUnit(
99
// CHECK-SAME: language: {{DW_LANG_ObjC|DW_LANG_C}}
10+
// CHECK: ![[CONCURRENCY_SHIMS_CU]] = distinct !DICompileUnit(
11+
// CHECK-SAME: language: {{DW_LANG_ObjC|DW_LANG_C}}
1012
// CHECK: DISubprogram(name: "Foo"{{.*}} unit: ![[CLANG_CU]],
1113

1214
Foo()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// RUN: %empty-directory(%t.mod)
2-
// RUN: %swift -emit-module -o %t.mod/cake1.swiftmodule %S/Inputs/cake1.swift -disable-implicit-string-processing-module-import -parse-as-library
2+
// RUN: %swift -emit-module -o %t.mod/cake1.swiftmodule %S/Inputs/cake1.swift -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-as-library
33
// RUN: %sourcekitd-test -req=doc-info -module cake1 -- -Xfrontend -disable-implicit-concurrency-module-import -Xfrontend -disable-implicit-string-processing-module-import -I %t.mod > %t.response
44
// RUN: %diff -u %s.response %t.response

0 commit comments

Comments
 (0)