Skip to content

Commit bb87fd7

Browse files
meg-guptameg-gupta
committed
Update some test configs where stdlib is loaded later
1 parent 133602d commit bb87fd7

15 files changed

+48
-26
lines changed

‎lib/AST/ConformanceLookupTable.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,11 @@ void ConformanceLookupTable::registerProtocolConformance(
10351035
DeclContext *dc, ProtocolConformance *conformance,
10361036
bool synthesized) {
10371037
auto protocol = conformance->getProtocol();
1038+
auto *bitwiseCopyableProtocol =
1039+
dc->getASTContext().getProtocol(KnownProtocolKind::BitwiseCopyable);
1040+
if (protocol == bitwiseCopyableProtocol) {
1041+
llvm::dbgs() << "bc\n";
1042+
}
10381043
auto nominal = dc->getSelfNominalTypeDecl();
10391044

10401045
// If there is an entry to update, do so.

‎lib/SILGen/ResultPlan.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,9 +1374,22 @@ ResultPlanBuilder::buildScalarIntoPack(SILValue packAddr,
13741374
return plan;
13751375
}
13761376

1377+
1378+
static bool isBitwiseCopyable(Type type, ASTContext &ctx) {
1379+
auto *bitwiseCopyableProtocol =
1380+
ctx.getProtocol(KnownProtocolKind::BitwiseCopyable);
1381+
if (!bitwiseCopyableProtocol) {
1382+
return false;
1383+
}
1384+
return (bool)checkConformance(type, bitwiseCopyableProtocol);
1385+
}
1386+
13771387
ResultPlanPtr ResultPlanBuilder::buildForTuple(Initialization *init,
13781388
AbstractionPattern origType,
13791389
CanType substType) {
1390+
if (isBitwiseCopyable(substType, SGF.getASTContext())) {
1391+
llvm::dbgs() << "is bitwisecopyable";
1392+
}
13801393
// If we have an initialization, and we can split the initialization,
13811394
// emit directly into the initialization. If the orig tuple vanishes,
13821395
// that counts as the initialization being splittable.

‎test/IRGen/builtins.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
2-
// RUN: %target-swift-frontend -module-name builtins -parse-stdlib -Xllvm -sil-disable-pass=target-constant-folding -disable-access-control -primary-file %s -emit-ir -o - -disable-objc-attr-requires-foundation-module | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime
1+
// RUN: %target-swift-frontend -enable-builtin-module -module-name builtins -Xllvm -sil-disable-pass=target-constant-folding -disable-access-control -primary-file %s -emit-ir -o - -disable-objc-attr-requires-foundation-module | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-runtime
32

43
// REQUIRES: CPU=x86_64 || CPU=arm64 || CPU=arm64e
54

6-
import Swift
5+
import Builtin
76

87
typealias Int = Builtin.Int32
98
typealias Bool = Builtin.Int1

‎test/IRGen/polymorphic_builtins.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// This line tests that IRGen is properly turning the unspecialized builtins
22
// into traps.
33
//
4-
// RUN: %target-swift-frontend -emit-ir -parse-as-library -parse-stdlib -Xllvm -sil-disable-pass=Simplification %s | %FileCheck %s
4+
// RUN: %target-swift-frontend -enable-builtin-module -emit-ir -parse-as-library -Xllvm -sil-disable-pass=Simplification %s | %FileCheck %s
55

66
// Make sure we are not eliminating these builtins before IRGen runs. As part of
77
// the builtin's contract, we expect IRGen to convert them to traps, not
88
// anything before.
99
//
10-
// RUN: %target-swift-frontend -emit-sil -parse-as-library -parse-stdlib -Xllvm -sil-disable-pass=Simplification %s | %FileCheck --check-prefix=SIL %s
10+
// RUN: %target-swift-frontend -enable-builtin-module -emit-sil -parse-as-library -Xllvm -sil-disable-pass=Simplification %s | %FileCheck --check-prefix=SIL %s
1111

12-
import Swift
12+
import Builtin
1313

1414
// SIL-LABEL: sil [transparent] @$s20polymorphic_builtins11_isConcrete4typeSbxm_tlF : $@convention(thin) <T> (@thick T.Type) -> Bool {
1515
// SIL: builtin "isConcrete"<T>({{%[0-9]*}} : $@thick T.Type) : $Builtin.Int1

‎test/Inputs/polymorphic_builtins.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
import Swift
1+
import Builtin
32

43
// =============================================================================
54

‎test/Interpreter/polymorphic_builtins.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77

88
// RUN: %empty-directory(%t)
99

10-
// RUN: %target-build-swift-dylib(%t/%target-library-name(mysimd)) -enable-library-evolution %S/../Inputs/polymorphic_builtins.swift -emit-module -emit-module-path %t/mysimd.swiftmodule -module-name mysimd -parse-stdlib -D DEBUG -Onone
10+
// RUN: %target-build-swift-dylib(%t/%target-library-name(mysimd)) -enable-builtin-module -enable-library-evolution %S/../Inputs/polymorphic_builtins.swift -emit-module -emit-module-path %t/mysimd.swiftmodule -module-name mysimd -D DEBUG -Onone
1111
// RUN: %target-codesign %t/%target-library-name(mysimd)
1212

13-
// RUN: %target-build-swift %s -L %t -I %t -lmysimd -parse-stdlib -Xfrontend -disable-access-control -Xfrontend -sil-verify-all %target-rpath(%t) -o %t/a.out -D DEBUG -Onone
13+
// RUN: %target-build-swift -enable-builtin-module %s -L %t -I %t -lmysimd -Xfrontend -disable-access-control -Xfrontend -sil-verify-all %target-rpath(%t) -o %t/a.out -D DEBUG -Onone
1414
// RUN: %target-codesign %t/a.out
1515

1616
// RUN: %target-run %t/a.out %t/%target-library-name(mysimd)
1717

1818
// RUN: %empty-directory(%t)
1919

20-
// RUN: %target-build-swift-dylib(%t/%target-library-name(mysimd)) -enable-library-evolution %S/../Inputs/polymorphic_builtins.swift -emit-module -emit-module-path %t/mysimd.swiftmodule -module-name mysimd -parse-stdlib -O
20+
// RUN: %target-build-swift-dylib(%t/%target-library-name(mysimd)) -enable-builtin-module -enable-library-evolution %S/../Inputs/polymorphic_builtins.swift -emit-module -emit-module-path %t/mysimd.swiftmodule -module-name mysimd -O
2121
// RUN: %target-codesign %t/%target-library-name(mysimd)
2222

23-
// RUN: %target-build-swift %s -L %t -I %t -lmysimd -parse-stdlib -Xfrontend -disable-access-control -Xfrontend -sil-verify-all %target-rpath(%t) -o %t/a.out -O
23+
// RUN: %target-build-swift -enable-builtin-module %s -L %t -I %t -lmysimd -Xfrontend -disable-access-control -Xfrontend -sil-verify-all %target-rpath(%t) -o %t/a.out -O
2424
// RUN: %target-codesign %t/a.out
2525

2626
// RUN: %target-run %t/a.out %t/%target-library-name(mysimd)
2727

2828
// REQUIRES: executable_test
2929

30-
import Swift
30+
import Builtin
3131
import StdlibUnittest
3232
import mysimd
3333

‎test/ModuleInterface/ModuleCache/Inputs/mock-sdk/ExportedLib.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// swift-interface-format-version: 1.0
2-
// swift-module-flags: -parse-stdlib -module-name ExportedLib
2+
// swift-module-flags: -module-name ExportedLib
33

44
@_exported import SomeCModule
55

‎test/ModuleInterface/ModuleCache/Inputs/mock-sdk/SdkLib.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// swift-interface-format-version: 1.0
2-
// swift-module-flags: -parse-stdlib -module-name SdkLib
2+
// swift-module-flags: -module-name SdkLib
33

44
@_exported import ExportedLib
55

‎test/ModuleInterface/ModuleCache/module-cache-options.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// RUN: %empty-directory(%t)
33
// RUN: split-file %s %t
44

5-
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -parse-stdlib -I %t -emit-module-interface-path %t/LeafModule.swiftinterface -module-name LeafModule %t/leaf.swift -emit-module -o /dev/null
6-
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -parse-stdlib -I %t -module-cache-path %t/swiftcache -emit-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -emit-module -o /dev/null
7-
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -parse-stdlib -I %t -module-cache-path %t/swiftcache -Xcc -fmodules-cache-path=%t/clangcache -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %t/main.swift
5+
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -I %t -emit-module-interface-path %t/LeafModule.swiftinterface -module-name LeafModule %t/leaf.swift -emit-module -o /dev/null
6+
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -I %t -module-cache-path %t/swiftcache -emit-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -emit-module -o /dev/null
7+
// RUN: %target-swift-frontend -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -I %t -module-cache-path %t/swiftcache -Xcc -fmodules-cache-path=%t/clangcache -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %t/main.swift
88

99
// RUN: NUM_SWIFT_MODULES=$(find %t/swiftcache -type f -name '*.swiftmodule' | wc -l)
1010
// RUN: NUM_CLANG_MODULES=$(find %t/clangcache -type f -name '*.pcm' | wc -l)

‎test/SILGen/builtins.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// RUN: %target-swift-emit-silgen -parse-stdlib %s -disable-access-control -disable-objc-attr-requires-foundation-module -enable-objc-interop | %FileCheck %s
2-
// RUN: %target-swift-emit-sil -Onone -parse-stdlib %s -disable-access-control -disable-objc-attr-requires-foundation-module -enable-objc-interop | %FileCheck -check-prefix=CANONICAL %s
1+
// RUN: %target-swift-emit-silgen -enable-builtin-module %s -disable-access-control -disable-objc-attr-requires-foundation-module -enable-objc-interop | %FileCheck %s
2+
// RUN: %target-swift-emit-sil -enable-builtin-module -Onone %s -disable-access-control -disable-objc-attr-requires-foundation-module -enable-objc-interop | %FileCheck -check-prefix=CANONICAL %s
33

44
// REQUIRES: swift_in_compiler
55

6-
import Swift
6+
import Builtin
77

88
protocol ClassProto : class { }
99

‎test/SILGen/polymorphic_builtins.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// RUN: %target-swift-frontend -parse-stdlib -emit-silgen %s | %FileCheck %s
1+
// RUN: %target-swift-frontend -enable-builtin-module -emit-silgen %s | %FileCheck %s
2+
3+
import Builtin
24

35
// CHECK-LABEL: sil hidden [ossa] @$s20polymorphic_builtins{{.*}}concreteAddTest{{.*}} : $@convention(thin) (Builtin.Vec4xInt32, Builtin.Vec4xInt32) -> Builtin.Vec4xInt32 {
46
// CHECK: bb0([[ARG0:%.*]] : $Builtin.Vec4xInt32, [[ARG1:%.*]] : $Builtin.Vec4xInt32):

‎test/SILOptimizer/capture_promotion_generic_context.sil

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
sil_stage raw
44

55
import Builtin
6+
import Swift
67

78
typealias Int = Builtin.Int32
89

‎test/SILOptimizer/capture_promotion_generic_context_ownership.sil

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
sil_stage raw
44

55
import Builtin
6+
import Swift
67

78
typealias Int = Builtin.Int32
89

‎test/SILOptimizer/constant_propagation_stdlib.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
// RUN: %target-swift-frontend -module-name constant_propagation_stdlib %s -parse-stdlib -emit-sil -o - | %FileCheck --check-prefix=CHECK-ONONE %s
2-
// RUN: %target-swift-frontend -module-name constant_propagation_stdlib %s -parse-stdlib -emit-sil -o - -O | %FileCheck --check-prefix=CHECK-O %s
1+
// RUN: %target-swift-frontend -module-name constant_propagation_stdlib %s -emit-sil -enable-builtin-module -o - | %FileCheck --check-prefix=CHECK-ONONE %s
2+
// RUN: %target-swift-frontend -module-name constant_propagation_stdlib %s -emit-sil -enable-builtin-module -o - -O | %FileCheck --check-prefix=CHECK-O %s
33

44
// REQUIRES: swift_in_compiler
55

6+
import Builtin
7+
68
public struct MyInt {
79
var v: Builtin.Int32
810
}

‎test/SILOptimizer/polymorphic_builtins_diagnostics.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %target-swift-frontend -parse-stdlib -emit-sil -verify %s
1+
// RUN: %target-swift-frontend -emit-sil -enable-builtin-module -verify %s
22

3-
import Swift
3+
import Builtin
44

55
struct MyInt {
66
var i: Builtin.Int64

0 commit comments

Comments
 (0)