Code review feedback from @jrose-apple for "95e9a0 The frontend should stop if the stdlib failed to load"

slavapestov · slavapestov · commit cf3317ebf488 · 2015-11-06T11:07:38.000-08:00
diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp
@@ -256,8 +256,11 @@ void CompilerInstance::performSema() {
     }
 
     // If we failed to load, we should have already diagnosed
-    if (M->failedToLoad())
+    if (M->failedToLoad()) {
+      assert(Diagnostics.hadAnyError() &&
+             "Module failed to load but nothing was diagnosed?");
       return;
+    }
 
     break;
   }
diff --git a/test/ClangModules/bad-deployment-target.swift b/test/ClangModules/bad-deployment-target.swift
@@ -1,4 +1,4 @@
-// RUN: not %swift -parse -target x86_64-apple-macosx10.8 %clang-importer-sdk -I %S/Inputs/custom-modules %s
+// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -target x86_64-apple-macosx10.8 %s
 //
 // This test ensures that a -target that is too old for the standard library
 // will not crash in the ClangImporter.

Original file line number	Diff line number	Diff line change
`@@ -256,8 +256,11 @@ void CompilerInstance::performSema() {`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`// If we failed to load, we should have already diagnosed`
`259`		`- if (M->failedToLoad())`
	`259`	`+ if (M->failedToLoad()) {`
	`260`	`+ assert(Diagnostics.hadAnyError() &&`
	`261`	`+ "Module failed to load but nothing was diagnosed?");`
`260`	`262`	`return;`
	`263`	`+ }`
`261`	`264`
`262`	`265`	`break;`
`263`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: not %swift -parse -target x86_64-apple-macosx10.8 %clang-importer-sdk -I %S/Inputs/custom-modules %s`
	`1`	`+// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse -target x86_64-apple-macosx10.8 %s`
`2`	`2`	`//`
`3`	`3`	`// This test ensures that a -target that is too old for the standard library`
`4`	`4`	`// will not crash in the ClangImporter.`