Merge pull request #70097 from apple/egorzhdan/base-method-cast

egorzhdan · web-flow · commit e761d9a796d9 · 2023-12-04T12:41:51.000+01:00
[cxx-interop] Do not crash when synthesizing a base method call
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -4978,7 +4978,7 @@ FuncDecl *synthesizeBaseFunctionDeclCall(ClangImporter &impl, ASTContext &ctx,
       cast<clang::CXXRecordDecl>(baseStruct->getClangDecl()), cxxMethod);
   if (!newClangMethod)
     return nullptr;
-  return cast<FuncDecl>(
+  return cast_or_null<FuncDecl>(
       ctx.getClangModuleLoader()->importDeclDirectly(newClangMethod));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4978,7 +4978,7 @@ FuncDecl *synthesizeBaseFunctionDeclCall(ClangImporter &impl, ASTContext &ctx,`
`4978`	`4978`	`cast<clang::CXXRecordDecl>(baseStruct->getClangDecl()), cxxMethod);`
`4979`	`4979`	`if (!newClangMethod)`
`4980`	`4980`	`return nullptr;`
`4981`		`- return cast<FuncDecl>(`
	`4981`	`+ return cast_or_null<FuncDecl>(`
`4982`	`4982`	`ctx.getClangModuleLoader()->importDeclDirectly(newClangMethod));`
`4983`	`4983`	`}`
`4984`	`4984`