[embedded] Wrap SwiftCompilerSources initialization state into swiftModulesInitialized API

Author: kubamracek

include/swift/SIL/SILBridging.h

@@ -60,7 +60,7 @@ class SwiftPassInvocation;
 class GenericSpecializationInformation;
 }
 
-extern bool nodeMetatypesInitialized;
+bool swiftModulesInitialized();
 void registerBridgedClass(BridgedStringRef className, SwiftMetatype metatype);
 
 struct BridgedType {

lib/Frontend/CompilerInvocation.cpp

@@ -522,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);
 }
 
@@ -1335,7 +1335,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.BypassResilienceChecks |= Args.hasArg(OPT_bypass_resilience);
 
   if (Opts.hasFeature(Feature::Embedded)) {
-    assert(nodeMetatypesInitialized && "no SwiftCompilerSources");
+    assert(swiftModulesInitialized() && "no SwiftCompilerSources");
 
     Opts.UnavailableDeclOptimizationMode = UnavailableDeclOptimization::Complete;
     Opts.DisableImplicitStringProcessingModuleImport = true;

lib/SIL/Utils/SILBridging.cpp

@@ -31,15 +31,19 @@
 
 using namespace swift;
 
-bool nodeMetatypesInitialized = false;
-
 namespace {
 
+bool nodeMetatypesInitialized = false;
+
 // Filled in by class registration in initializeSwiftModules().
 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];