Merge pull request #68568 from apple/embedded-wmo-via-primaryfiles

swift-ci · web-flow · commit f14b4268024f · 2023-09-25T21:55:07.000-07:00
[embedded] Detect WMO via .hasPrimaryInputs() instead of -wmo flag presence
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -1331,7 +1331,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
       HadError = true;
     }
 
-    if (FrontendOpts.InputsAndOutputs.hasPrimaryInputs()) {
+    if (!FrontendOpts.InputsAndOutputs.isWholeModule()) {
       Diags.diagnose(SourceLoc(), diag::wmo_with_embedded);
       HadError = true;
     }

Original file line number	Diff line number	Diff line change
`@@ -1331,7 +1331,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,`
`1331`	`1331`	`HadError = true;`
`1332`	`1332`	`}`
`1333`	`1333`
`1334`		`- if (FrontendOpts.InputsAndOutputs.hasPrimaryInputs()) {`
	`1334`	`+ if (!FrontendOpts.InputsAndOutputs.isWholeModule()) {`
`1335`	`1335`	`Diags.diagnose(SourceLoc(), diag::wmo_with_embedded);`
`1336`	`1336`	`HadError = true;`
`1337`	`1337`	`}`