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-10-17 12:15:00 -07:00
parent 083ff08307 c76f894c19
commit 848b66dca6
3 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/ClangImporter/ImportDecl.cpp
View File

@@ -57,6 +57,7 @@
#include "clang/AST/Decl.h"
#include "clang/AST/DeclCXX.h"
#include "clang/AST/DeclObjCCommon.h"
#include "clang/AST/Type.h"
#include "clang/Basic/Specifiers.h"
#include "clang/Basic/TargetInfo.h"
#include "clang/Lex/Preprocessor.h"
@@ -3833,11 +3834,36 @@ namespace {
return result;
}
static bool isNonEscapableAnnotatedType(const clang::Type *t) {
if (const auto *rd = t->getAsRecordDecl()) {
return hasNonEscapableAttr(rd);
}
return false;
}
static bool isEscapableAnnotatedType(const clang::Type *t) {
if (const auto *rd = t->getAsRecordDecl()) {
return hasEscapableAttr(rd);
}
return false;
}
void addLifetimeDependencies(const clang::FunctionDecl *decl,
AbstractFunctionDecl *result) {
if (decl->getTemplatedKind() == clang::FunctionDecl::TK_FunctionTemplate)
return;
auto retType = decl->getReturnType();
auto warnForEscapableReturnType = [&] {
if (isEscapableAnnotatedType(retType.getTypePtr())) {
Impl.addImportDiagnostic(
decl,
Diagnostic(diag::return_escapable_with_lifetimebound,
Impl.SwiftContext.AllocateCopy(retType.getAsString())),
decl->getLocation());
}
};
auto swiftParams = result->getParameters();
bool hasSelf = result->hasImplicitSelfDecl() && !isa<ConstructorDecl>(result);
SmallVector<LifetimeDependenceInfo, 1> lifetimeDependencies;
@@ -3847,6 +3873,7 @@ namespace {
hasSelf);
for (auto [idx, param] : llvm::enumerate(decl->parameters())) {
if (param->hasAttr<clang::LifetimeBoundAttr>()) {
warnForEscapableReturnType();
if (swiftParams->get(idx)->getInterfaceType()->isEscapable())
scopedLifetimeParamIndicesForReturn[idx] = true;
else
@@ -3854,6 +3881,7 @@ namespace {
}
}
if (implicitObjectParamIsLifetimeBound(decl)) {
warnForEscapableReturnType();
auto idx = result->getSelfIndex();
if (result->getImplicitSelfDecl()->getInterfaceType()->isEscapable())
scopedLifetimeParamIndicesForReturn[idx] = true;
@@ -3881,11 +3909,20 @@ namespace {
lifetimeDependencies.push_back(
LifetimeDependenceInfo(nullptr, nullptr, 0, /*isImmortal*/ true));
}
if (!lifetimeDependencies.empty()) {
if (lifetimeDependencies.empty()) {
if (isNonEscapableAnnotatedType(retType.getTypePtr())) {
Impl.addImportDiagnostic(
decl,
Diagnostic(diag::return_nonescapable_without_lifetimebound,
Impl.SwiftContext.AllocateCopy(retType.getAsString())),
decl->getLocation());
}
} else {
Impl.SwiftContext.evaluator.cacheOutput(
LifetimeDependenceInfoRequest{result},
Impl.SwiftContext.AllocateCopy(lifetimeDependencies));
}
Impl.diagnoseTargetDirectly(decl);
}
void finishFuncDecl(const clang::FunctionDecl *decl,