Merge pull request #65275 from DougGregor/load-plugin-missing-return

DougGregor · web-flow · commit f6ceec73b778 · 2023-04-18T21:30:30.000-07:00
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -6407,6 +6407,7 @@ LoadedExecutablePlugin *ASTContext::loadExecutablePlugin(StringRef path) {
   if (!plugin) {
     Diags.diagnose(SourceLoc(), diag::compiler_plugin_not_loaded, path,
                    llvm::toString(plugin.takeError()));
+    return nullptr;
   }
 
   return plugin.get();
@@ -6429,6 +6430,7 @@ LoadedLibraryPlugin *ASTContext::loadLibraryPlugin(StringRef path) {
   if (!plugin) {
     Diags.diagnose(SourceLoc(), diag::compiler_plugin_not_loaded, path,
                    llvm::toString(plugin.takeError()));
+    return nullptr;
   }
 
   return plugin.get();

Original file line number	Diff line number	Diff line change
`@@ -6407,6 +6407,7 @@ LoadedExecutablePlugin *ASTContext::loadExecutablePlugin(StringRef path) {`
`6407`	`6407`	`if (!plugin) {`
`6408`	`6408`	`Diags.diagnose(SourceLoc(), diag::compiler_plugin_not_loaded, path,`
`6409`	`6409`	`llvm::toString(plugin.takeError()));`
	`6410`	`+ return nullptr;`
`6410`	`6411`	`}`
`6411`	`6412`
`6412`	`6413`	`return plugin.get();`
`@@ -6429,6 +6430,7 @@ LoadedLibraryPlugin *ASTContext::loadLibraryPlugin(StringRef path) {`
`6429`	`6430`	`if (!plugin) {`
`6430`	`6431`	`Diags.diagnose(SourceLoc(), diag::compiler_plugin_not_loaded, path,`
`6431`	`6432`	`llvm::toString(plugin.takeError()));`
	`6433`	`+ return nullptr;`
`6432`	`6434`	`}`
`6433`	`6435`
`6434`	`6436`	`return plugin.get();`