Merge pull request #69403 from kubamracek/embedded-require-swiftsources

kubamracek · web-flow · commit 1f363be55d39 · 2023-11-07T14:41:12.000-08:00
[embedded] Require SwiftCompilerSources to use embedded Swift
diff --git a/include/swift/SIL/SILBridging.h b/include/swift/SIL/SILBridging.h
@@ -60,6 +60,7 @@ class SwiftPassInvocation;
 class GenericSpecializationInformation;
 }
 
+bool swiftModulesInitialized();
 void registerBridgedClass(BridgedStringRef className, SwiftMetatype metatype);
 
 struct BridgedType {
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -20,6 +20,7 @@
 #include "swift/Option/Options.h"
 #include "swift/Option/SanitizerOptions.h"
 #include "swift/Parse/ParseVersion.h"
+#include "swift/SIL/SILBridging.h"
 #include "swift/Strings.h"
 #include "swift/SymbolGraphGen/SymbolGraphOptions.h"
 #include "llvm/ADT/STLExtras.h"
@@ -521,12 +522,12 @@ static void diagnoseCxxInteropCompatMode(Arg *verArg, ArgList &Args,
   diags.diagnose(SourceLoc(), diag::valid_cxx_interop_modes, versStr);
 }
 
-static llvm::Optional<StrictConcurrency>
+static llvm::Optional<swift::StrictConcurrency>
 parseStrictConcurrency(StringRef value) {
-  return llvm::StringSwitch<llvm::Optional<StrictConcurrency>>(value)
-      .Case("minimal", StrictConcurrency::Minimal)
-      .Case("targeted", StrictConcurrency::Targeted)
-      .Case("complete", StrictConcurrency::Complete)
+  return llvm::StringSwitch<llvm::Optional<swift::StrictConcurrency>>(value)
+      .Case("minimal", swift::StrictConcurrency::Minimal)
+      .Case("targeted", swift::StrictConcurrency::Targeted)
+      .Case("complete", swift::StrictConcurrency::Complete)
       .Default(llvm::None);
 }
 
@@ -1334,6 +1335,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.BypassResilienceChecks |= Args.hasArg(OPT_bypass_resilience);
 
   if (Opts.hasFeature(Feature::Embedded)) {
+    assert(swiftModulesInitialized() && "no SwiftCompilerSources");
+
     Opts.UnavailableDeclOptimizationMode = UnavailableDeclOptimization::Complete;
     Opts.DisableImplicitStringProcessingModuleImport = true;
     Opts.DisableImplicitConcurrencyModuleImport = true;
diff --git a/lib/SIL/Utils/SILBridging.cpp b/lib/SIL/Utils/SILBridging.cpp
@@ -40,6 +40,10 @@ SwiftMetatype nodeMetatypes[(unsigned)SILNodeKind::Last_SILNode + 1];
 
 }
 
+bool swiftModulesInitialized() {
+  return nodeMetatypesInitialized;
+}
+
 // Does return null if initializeSwiftModules() is never called.
 SwiftMetatype SILNode::getSILNodeMetatype(SILNodeKind kind) {
   SwiftMetatype metatype = nodeMetatypes[(unsigned)kind];
diff --git a/test/embedded/anyobject-error-no-stdlib.swift b/test/embedded/anyobject-error-no-stdlib.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-emit-ir -parse-stdlib %s -enable-experimental-feature Embedded -verify -wmo
 
+// REQUIRES: swift_in_compiler
+
 public enum Never {}
 
 @_silgen_name("abort")
diff --git a/test/embedded/array-builtins-exec.swift b/test/embedded/array-builtins-exec.swift
@@ -3,6 +3,7 @@
 // RUN: %target-clang %t/main.o -o %t/a.out -dead_strip
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/array-to-pointer.swift b/test/embedded/array-to-pointer.swift
@@ -4,6 +4,7 @@
 // RUN: %target-clang %t/main.o %t/print.o -o %t/a.out -dead_strip
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/array-zero-size-struct.swift b/test/embedded/array-zero-size-struct.swift
@@ -1,5 +1,6 @@
 // RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature Embedded | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
diff --git a/test/embedded/arrays.swift b/test/embedded/arrays.swift
@@ -4,6 +4,7 @@
 // RUN: %target-clang %t/main.o %t/print.o -o %t/a.out -dead_strip
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/availability-code-removal.swift b/test/embedded/availability-code-removal.swift
@@ -10,6 +10,8 @@
 // RUN: %target-swift-frontend -emit-ir %s -parse-stdlib  -wmo | %FileCheck %s --check-prefix CHECK-A
 // RUN: %target-swift-frontend -emit-ir %s -parse-stdlib -enable-experimental-feature Embedded -wmo | %FileCheck %s --check-prefix CHECK-B
 
+// REQUIRES: swift_in_compiler
+
 public protocol Player {}
 struct Concrete: Player {}
 
diff --git a/test/embedded/availability.swift b/test/embedded/availability.swift
@@ -4,6 +4,8 @@
 // Building with embedded Swift should produce unavailability errors
 // RUN: %target-typecheck-verify-swift -parse-stdlib -enable-experimental-feature Embedded  -wmo
 
+// REQUIRES: swift_in_compiler
+
 @_unavailableInEmbedded
 public func embedded() { }
 public func regular() {
diff --git a/test/embedded/basic-errors-no-stdlib.swift b/test/embedded/basic-errors-no-stdlib.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-frontend -emit-ir -verify %s -parse-stdlib -enable-experimental-feature Embedded -wmo
 
+// REQUIRES: swift_in_compiler
+
 public protocol Player {}
 struct Concrete: Player {}
 
diff --git a/test/embedded/basic-modules-validation-no-stdlib.swift b/test/embedded/basic-modules-validation-no-stdlib.swift
@@ -13,6 +13,8 @@
 // RUN: %target-swift-frontend -emit-module -o %t/MyModule.swiftmodule %t/MyModule.swift -parse-stdlib -enable-experimental-feature Embedded -wmo
 // RUN: not %target-swift-frontend -emit-ir -I %t %t/Main.swift -parse-stdlib -wmo 2>&1 | %FileCheck %s --check-prefix CHECK-B
 
+// REQUIRES: swift_in_compiler
+
 // BEGIN MyModule.swift
 
 public func foo() { }
diff --git a/test/embedded/class-func.swift b/test/embedded/class-func.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift(%S/Inputs/print.swift -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/classes-arrays.swift b/test/embedded/classes-arrays.swift
@@ -3,6 +3,7 @@
 // RUN: %target-clang %t/main.o -o %t/a.out -dead_strip
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/classes-methods-no-stdlib.swift b/test/embedded/classes-methods-no-stdlib.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-emit-ir %s -parse-stdlib -enable-experimental-feature Embedded -target arm64e-apple-none -wmo | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
+
 public class MyClass {
   func foo() { }
   func bar() { }
diff --git a/test/embedded/classes-no-stdlib.swift b/test/embedded/classes-no-stdlib.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-emit-ir %s -parse-stdlib -enable-experimental-feature Embedded -target arm64e-apple-none -wmo | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
+
 public class MyClass {}
 
 // CHECK-DAG: @"$s4main7MyClassCN" = {{.*}}<{ ptr, ptr, ptr }> <{ ptr null, ptr @"$s4main7MyClassCfD", ptr @"$s4main7MyClassCACycfC" }>
diff --git a/test/embedded/classes-non-final-method-no-stdlib.swift b/test/embedded/classes-non-final-method-no-stdlib.swift
@@ -1,5 +1,7 @@
 // RUN: %target-swift-emit-ir -verify %s -parse-stdlib -enable-experimental-feature Embedded -target arm64e-apple-none -wmo
 
+// REQUIRES: swift_in_compiler
+
 public class MyClass {
   func foo<T>(t: T) { } // expected-error {{classes cannot have non-final generic fuctions in embedded Swift}}
   func bar() { }
diff --git a/test/embedded/classes-stack-promotion.swift b/test/embedded/classes-stack-promotion.swift
@@ -4,6 +4,7 @@
 // RUN: %target-clang %t/main.o -o %t/a.out -dead_strip
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/classes.swift b/test/embedded/classes.swift
@@ -3,6 +3,7 @@
 // RUN: %target-clang %t/main.o -o %t/a.out -dead_strip
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/closures-heap.swift b/test/embedded/closures-heap.swift
@@ -3,6 +3,7 @@
 // RUN: %target-clang %t/main.o -o %t/a.out -dead_strip
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/collection.swift b/test/embedded/collection.swift
@@ -4,6 +4,7 @@
 // RUN: %target-clang %t/a.o %t/print.o -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/conditionals.swift b/test/embedded/conditionals.swift
@@ -1,6 +1,8 @@
 // RUN: %target-swift-emit-ir %s -parse-stdlib | %FileCheck %s
 // RUN: %target-swift-emit-ir %s -parse-stdlib -enable-experimental-feature Embedded | %FileCheck %s --check-prefix EMBEDDED
 
+// REQUIRES: swift_in_compiler
+
 #if $Embedded
 public func embedded() { }
 #else
diff --git a/test/embedded/custom-print.swift b/test/embedded/custom-print.swift
@@ -3,6 +3,7 @@
 // RUN: %target-clang %t/a.o -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
diff --git a/test/embedded/deserialize-vtables.swift b/test/embedded/deserialize-vtables.swift
@@ -2,6 +2,7 @@
 // RUN: %target-run-simple-swift(-O -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 // RUN: %target-run-simple-swift(-Osize -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/evolution-with-embedded-diag.swift b/test/embedded/evolution-with-embedded-diag.swift
@@ -1,4 +1,6 @@
 // RUN: not %target-swift-frontend -emit-ir %s -enable-library-evolution -enable-experimental-feature Embedded -wmo 2>&1 | %FileCheck %s
 // RUN: not %target-swift-frontend -emit-ir %s -enable-resilience -enable-experimental-feature Embedded -wmo 2>&1 | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
+
 // CHECK: error: Library evolution cannot be enabled with embedded Swift.
diff --git a/test/embedded/generic-classes.swift b/test/embedded/generic-classes.swift
@@ -1,6 +1,7 @@
 // RUN: %target-run-simple-swift(%S/Inputs/print.swift -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 // RUN: %target-run-simple-swift(-Osize %S/Inputs/print.swift -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/lto.swift b/test/embedded/lto.swift
@@ -3,6 +3,7 @@
 // RUN: %target-clang %t/a.o -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
diff --git a/test/embedded/metatypes.swift b/test/embedded/metatypes.swift
@@ -1,5 +1,6 @@
 // RUN: %target-swift-emit-ir -verify %s -enable-experimental-feature Embedded -wmo
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
diff --git a/test/embedded/modules-classes.swift b/test/embedded/modules-classes.swift
@@ -7,6 +7,7 @@
 // RUN: %target-clang %t/a.o %t/print.o -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
diff --git a/test/embedded/modules-globals-exec.swift b/test/embedded/modules-globals-exec.swift
@@ -7,6 +7,7 @@
 // RUN: %target-clang %t/a.o %t/print.o -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
diff --git a/test/embedded/modules-print-exec.swift b/test/embedded/modules-print-exec.swift
@@ -7,6 +7,7 @@
 // RUN: %target-clang %t/a.o %t/print.o -o %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
diff --git a/test/embedded/no-autolink.swift b/test/embedded/no-autolink.swift
@@ -1,5 +1,6 @@
 // RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature Embedded | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
 
diff --git a/test/embedded/objc-with-embedded-diag.swift b/test/embedded/objc-with-embedded-diag.swift
@@ -4,4 +4,6 @@
 // RUN: not %target-swift-frontend -parse-stdlib -target arm64-apple-macos11 -emit-ir %s -enable-objc-interop -enable-experimental-feature Embedded 2>&1 | %FileCheck %s
 // RUN: %target-swift-frontend -parse-stdlib -target arm64-apple-macos11 -emit-ir %s -disable-objc-interop -enable-experimental-feature Embedded
 
+// REQUIRES: swift_in_compiler
+
 // CHECK: error: Objective-C interoperability cannot be enabled with embedded Swift.
diff --git a/test/embedded/once-dependent.swift b/test/embedded/once-dependent.swift
@@ -2,6 +2,7 @@
 // RUN: %target-clang %t/main.o -o %t/a.out -dead_strip
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/once-multithreaded.swift b/test/embedded/once-multithreaded.swift
@@ -5,6 +5,7 @@
 // RUN: %target-clang %t/main.o -o %t/a.out -dead_strip
 // RUN: %target-run %t/a.out | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/once.swift b/test/embedded/once.swift
@@ -2,6 +2,7 @@
 // RUN: %target-run-simple-swift(-O %S/Inputs/print.swift -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 // RUN: %target-run-simple-swift(-O -lto=llvm-full %lto_flags %S/Inputs/print.swift -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/ouroboros-bug.swift b/test/embedded/ouroboros-bug.swift
@@ -6,6 +6,7 @@
 // RUN: %target-swift-frontend -target armv7-apple-none-macho -assert-config Debug -Osize -Xcc -D__MACH__ -emit-ir %s -enable-experimental-feature Embedded | %FileCheck %s
 // RUN: %target-swift-frontend -target arm64-apple-none-macho -assert-config Debug -Osize -Xcc -D__MACH__ -Xcc -D__arm64__ -Xcc -D__APPLE__ -emit-ir %s -enable-experimental-feature Embedded | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: VENDOR=apple
 // REQUIRES: optimized_stdlib
 
diff --git a/test/embedded/runtime-release.swift b/test/embedded/runtime-release.swift
@@ -2,6 +2,7 @@
 // RUN: %target-run-simple-swift(%S/Inputs/print.swift -O -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 // RUN: %target-run-simple-swift(%S/Inputs/print.swift -Osize -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/runtime.swift b/test/embedded/runtime.swift
@@ -2,6 +2,7 @@
 // RUN: %target-run-simple-swift(-O -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 // RUN: %target-run-simple-swift(-Osize -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/static-object.swift b/test/embedded/static-object.swift
@@ -1,6 +1,7 @@
 // RUN: %target-swift-frontend -O -emit-irgen %s %S/Inputs/print.swift -module-name main -parse-as-library -enable-experimental-feature Embedded | %FileCheck %s --check-prefix CHECK-IR
 // RUN: %target-run-simple-swift(-O %S/Inputs/print.swift -enable-experimental-feature Embedded -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/static-string-interpolation.swift b/test/embedded/static-string-interpolation.swift
@@ -1,5 +1,6 @@
 // RUN: %target-run-simple-swift(%S/Inputs/print.swift -enable-experimental-feature Embedded -Xfrontend -throws-as-traps -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/stdlib-basic.swift b/test/embedded/stdlib-basic.swift
@@ -1,6 +1,7 @@
 // RUN: %target-swift-frontend -target armv7-apple-none-macho -Xcc -D__MACH__ -emit-ir %s -enable-experimental-feature Embedded | %FileCheck %s
 // RUN: %target-swift-frontend -target arm64-apple-none-macho -Xcc -D__MACH__ -Xcc -D__arm64__ -Xcc -D__APPLE__ -emit-ir %s -enable-experimental-feature Embedded | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: VENDOR=apple
 
 public func bool() -> Bool {
diff --git a/test/embedded/stdlib-types.swift b/test/embedded/stdlib-types.swift
@@ -1,6 +1,7 @@
 // RUN: %target-swift-frontend -target armv7-apple-none-macho -Xcc -D__MACH__ -emit-ir %s -enable-experimental-feature Embedded | %FileCheck %s
 // RUN: %target-swift-frontend -target arm64-apple-none-macho -Xcc -D__MACH__ -Xcc -D__arm64__ -Xcc -D__APPLE__ -emit-ir %s -enable-experimental-feature Embedded | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: VENDOR=apple
 // REQUIRES: optimized_stdlib
 
diff --git a/test/embedded/throw-trap-stdlib.swift b/test/embedded/throw-trap-stdlib.swift
@@ -1,5 +1,6 @@
 // RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature Embedded -throws-as-traps | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
 
diff --git a/test/embedded/throw-trap.swift b/test/embedded/throw-trap.swift
@@ -2,6 +2,7 @@
 // RUN: %target-swift-frontend -emit-sil %s -enable-experimental-feature Embedded -throws-as-traps | %FileCheck %s --check-prefix CHECK-TRAPS-SIL
 // RUN: %target-swift-frontend -emit-ir %s -enable-experimental-feature Embedded -throws-as-traps | %FileCheck %s --check-prefix CHECK-TRAPS-IR
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: VENDOR=apple
 // REQUIRES: OS=macosx
 
diff --git a/test/embedded/throw-typed.swift b/test/embedded/throw-typed.swift
@@ -2,6 +2,7 @@
 // RUN: %target-run-simple-swift(%S/Inputs/print.swift -O -enable-experimental-feature Embedded -enable-experimental-feature TypedThrows -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 // RUN: %target-run-simple-swift(%S/Inputs/print.swift -Osize -enable-experimental-feature Embedded -enable-experimental-feature TypedThrows -parse-as-library -runtime-compatibility-version none -wmo -Xfrontend -disable-objc-interop) | %FileCheck %s
 
+// REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
 // REQUIRES: VENDOR=apple
diff --git a/test/embedded/typeof.swift b/test/embedded/typeof.swift
diff --git a/test/embedded/wmo-with-embedded-diag.swift b/test/embedded/wmo-with-embedded-diag.swift

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ class SwiftPassInvocation;`
`60`	`60`	`class GenericSpecializationInformation;`
`61`	`61`	`}`
`62`	`62`
	`63`	`+bool swiftModulesInitialized();`
`63`	`64`	`void registerBridgedClass(BridgedStringRef className, SwiftMetatype metatype);`
`64`	`65`
`65`	`66`	`struct BridgedType {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ SwiftMetatype nodeMetatypes[(unsigned)SILNodeKind::Last_SILNode + 1];`
`40`	`40`
`41`	`41`	`}`
`42`	`42`
	`43`	`+bool swiftModulesInitialized() {`
	`44`	`+ return nodeMetatypesInitialized;`
	`45`	`+}`
	`46`	`+`
`43`	`47`	`// Does return null if initializeSwiftModules() is never called.`
`44`	`48`	`SwiftMetatype SILNode::getSILNodeMetatype(SILNodeKind kind) {`
`45`	`49`	`SwiftMetatype metatype = nodeMetatypes[(unsigned)kind];`