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

DougGregor · web-flow · commit ee61e11b4d04 · 2023-04-19T06:15:39.000-07:00
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -6393,6 +6393,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();
@@ -6415,6 +6416,7 @@ void *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
`@@ -6393,6 +6393,7 @@ LoadedExecutablePlugin *ASTContext::loadExecutablePlugin(StringRef path) {`
`6393`	`6393`	`if (!plugin) {`
`6394`	`6394`	`Diags.diagnose(SourceLoc(), diag::compiler_plugin_not_loaded, path,`
`6395`	`6395`	`llvm::toString(plugin.takeError()));`
	`6396`	`+ return nullptr;`
`6396`	`6397`	`}`
`6397`	`6398`
`6398`	`6399`	`return plugin.get();`
`@@ -6415,6 +6416,7 @@ void *ASTContext::loadLibraryPlugin(StringRef path) {`
`6415`	`6416`	`if (!plugin) {`
`6416`	`6417`	`Diags.diagnose(SourceLoc(), diag::compiler_plugin_not_loaded, path,`
`6417`	`6418`	`llvm::toString(plugin.takeError()));`
	`6419`	`+ return nullptr;`
`6418`	`6420`	`}`
`6419`	`6421`
`6420`	`6422`	`return plugin.get();`