Merge pull request #42574 from ahoppen/pr/report-more-specific-compilation-setup-failed-error

ahoppen · web-flow · commit df710efe34fb · 2022-04-25T10:16:09.000+02:00
[SourceKit] If setting up the compiler instance failed with an error, don't override it with a generic error message
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp b/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
@@ -1049,9 +1049,10 @@ ASTUnitRef ASTBuildOperation::buildASTUnit(std::string &Error) {
   }
 
   if (CompIns.setup(Invocation, Error)) {
-    // FIXME: Report the diagnostic.
     LOG_WARN_FUNC("Compilation setup failed!!!");
-    Error = "compilation setup failed";
+    if (Error.empty()) {
+      Error = "compilation setup failed";
+    }
     return nullptr;
   }
   registerIDERequestFunctions(CompIns.getASTContext().evaluator);

Original file line number	Diff line number	Diff line change
`@@ -1049,9 +1049,10 @@ ASTUnitRef ASTBuildOperation::buildASTUnit(std::string &Error) {`
`1049`	`1049`	`}`
`1050`	`1050`
`1051`	`1051`	`if (CompIns.setup(Invocation, Error)) {`
`1052`		`- // FIXME: Report the diagnostic.`
`1053`	`1052`	`LOG_WARN_FUNC("Compilation setup failed!!!");`
`1054`		`- Error = "compilation setup failed";`
	`1053`	`+ if (Error.empty()) {`
	`1054`	`+ Error = "compilation setup failed";`
	`1055`	`+ }`
`1055`	`1056`	`return nullptr;`
`1056`	`1057`	`}`
`1057`	`1058`	`registerIDERequestFunctions(CompIns.getASTContext().evaluator);`