averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2024-08-29 20:55:52 -07:00
parent 1c7d7d56c9 5bd7a27e96
commit 1b23f6a9b2
4 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ClangImporter/SwiftDeclSynthesizer.cpp
View File

@@ -2112,6 +2112,8 @@ clang::CXXMethodDecl *SwiftDeclSynthesizer::synthesizeCXXForwardingMethod(
}
newMethod->setParams(params);
clang::Sema::SynthesizedFunctionScope scope(clangSema, newMethod);
// Create a new Clang diagnostic pool to capture any diagnostics
// emitted during the construction of the method.
clang::sema::DelayedDiagnosticPool diagPool{
@@ -2165,8 +2167,9 @@ clang::CXXMethodDecl *SwiftDeclSynthesizer::synthesizeCXXForwardingMethod(
clang::SourceLocation());
if (!memberCall.isUsable())
return nullptr;
auto returnStmt = clang::ReturnStmt::Create(clangCtx, clang::SourceLocation(),
memberCall.get(), nullptr);
auto returnStmt =
clangSema.BuildReturnStmt(clang::SourceLocation(), memberCall.get())
.get();
// Check if there were any Clang errors during the construction
// of the method body.