[IRGen] Fix diagnostic for CVW disablement through block list (#72624)

drexin · web-flow · commit b62091695ea9 · 2024-03-27T16:12:47.000-07:00
rdar://125486631
diff --git a/lib/IRGen/IRGen.cpp b/lib/IRGen/IRGen.cpp
@@ -1408,11 +1408,7 @@ static void performParallelIRGeneration(IRGenDescriptor desc) {
       DidRunSILCodeGenPreparePasses = true;
     }
 
-    if (!layoutStringsEnabled(*IGM)) {
-      auto moduleName = IGM->getSwiftModule()->getRealName().str();
-      IGM->Context.Diags.diagnose(SourceLoc(), diag::layout_strings_blocked,
-                                  moduleName);
-    }
+    (void)layoutStringsEnabled(*IGM, /*diagnose*/ true);
   }
   
   if (!IGMcreated) {

Original file line number	Diff line number	Diff line change
`@@ -1408,11 +1408,7 @@ static void performParallelIRGeneration(IRGenDescriptor desc) {`
`1408`	`1408`	`DidRunSILCodeGenPreparePasses = true;`
`1409`	`1409`	`}`
`1410`	`1410`
`1411`		`- if (!layoutStringsEnabled(*IGM)) {`
`1412`		`- auto moduleName = IGM->getSwiftModule()->getRealName().str();`
`1413`		`- IGM->Context.Diags.diagnose(SourceLoc(), diag::layout_strings_blocked,`
`1414`		`- moduleName);`
`1415`		`- }`
	`1411`	`+ (void)layoutStringsEnabled(IGM, /diagnose*/ true);`
`1416`	`1412`	`}`
`1417`	`1413`
`1418`	`1414`	`if (!IGMcreated) {`