[embedded] Detect WMO via .hasPrimaryInputs() instead of -wmo flag presense

Author: kubamracek

lib/Frontend/CompilerInvocation.cpp

@@ -1327,6 +1327,11 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
       Diags.diagnose(SourceLoc(), diag::evolution_with_embedded);
       HadError = true;
     }
+
+    if (FrontendOpts.InputsAndOutputs.hasPrimaryInputs()) {
+      Diags.diagnose(SourceLoc(), diag::wmo_with_embedded);
+      HadError = true;
+    }
   }
 
   if (auto A = Args.getLastArg(OPT_checked_async_objc_bridging)) {
@@ -1344,15 +1349,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     }
   }
 
-  // Is this the correct way to query for WMO?
-  bool isWMO =
-    Args.hasArg(OPT_wmo) ||
-    Args.hasArg(OPT_whole_module_optimization);
-  if (!isWMO && Opts.hasFeature(Feature::Embedded)) {
-    Diags.diagnose(SourceLoc(), diag::wmo_with_embedded);
-    HadError = true;
-  }
-
   return HadError || UnsupportedOS || UnsupportedArch;
 }
 

test/embedded/wmo-with-embedded-diag.swift

@@ -1,3 +1,7 @@
-// RUN: not %target-swift-frontend -emit-ir %s -enable-experimental-feature Embedded 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck -parse-stdlib %s -enable-experimental-feature Embedded
+// RUN: not %target-swift-frontend -typecheck -parse-stdlib %s -primary-file %s -enable-experimental-feature Embedded 2>&1 | %FileCheck %s
+
+// RUN: %target-swiftc_driver -typecheck -parse-stdlib %s -enable-experimental-feature Embedded -wmo
+// RUN: not %target-swiftc_driver -typecheck -parse-stdlib %s -enable-experimental-feature Embedded 2>&1 | %FileCheck %s
 
 // CHECK: error: Whole module optimization (wmo) must be enabled with embedded Swift.