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

Revert "Merge pull request #82480 from swiftlang/gaborh/addressable_params_copy"

Browse Source 
Unfortunately, addressable parameters are viral, the whole dependency
chain needs to be consistent otherwise we get deserialization errors
when loading a module. The solution is to universally enable addressable
parameters for C++ interop but there are some blockers at the moment
that need to be solved first. Temporarily revert these changes until
those blockers are resolved.

This reverts commit b00ff4568b, reversing
changes made to 396379ecbf.
This commit is contained in:
Gabor Horvath
2025-07-22 14:03:24 +01:00
parent 3a28941b10
commit db4b4c8abe
7 changed files with 9 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/ClangImporter/SwiftDeclSynthesizer.cpp
View File

@@ -1681,7 +1681,6 @@ SubscriptDecl *SwiftDeclSynthesizer::makeSubscript(FuncDecl *getter,
FuncDecl *getterImpl = getter ? getter : setter;
FuncDecl *setterImpl = setter;
// FIXME: support unsafeAddress accessors.
// Get the return type wrapped in `Unsafe(Mutable)Pointer<T>`.
const auto rawElementTy = getterImpl->getResultInterfaceType();
// Unwrap `T`. Use rawElementTy for return by value.
@@ -1764,23 +1763,6 @@ SubscriptDecl *SwiftDeclSynthesizer::makeSubscript(FuncDecl *getter,
return subscript;
}
static bool doesReturnDependsOnSelf(FuncDecl *f) {
if (!f->getASTContext().LangOpts.hasFeature(Feature::AddressableParameters))
return false;
if (!f->hasImplicitSelfDecl())
return false;
if (auto deps = f->getLifetimeDependencies()) {
for (auto dependence : *deps) {
auto returnIdx = f->getParameters()->size() + !isa<ConstructorDecl>(f);
if (!dependence.hasInheritLifetimeParamIndices() &&
dependence.hasScopeLifetimeParamIndices() &&
dependence.getTargetIndex() == returnIdx)
return dependence.getScopeIndices()->contains(f->getSelfIndex());
}
}
return false;
}
// MARK: C++ dereference operator
VarDecl *
@@ -1792,7 +1774,6 @@ SwiftDeclSynthesizer::makeDereferencedPointeeProperty(FuncDecl *getter,
FuncDecl *getterImpl = getter ? getter : setter;
FuncDecl *setterImpl = setter;
auto dc = getterImpl->getDeclContext();
bool resultDependsOnSelf = doesReturnDependsOnSelf(getterImpl);
// Get the return type wrapped in `Unsafe(Mutable)Pointer<T>`.
const auto rawElementTy = getterImpl->getResultInterfaceType();
@@ -1803,9 +1784,9 @@ SwiftDeclSynthesizer::makeDereferencedPointeeProperty(FuncDecl *getter,
// Use 'address' or 'mutableAddress' accessors for non-copyable
// types that are returned indirectly.
bool isNoncopyable = dc->mapTypeIntoContext(elementTy)->isNoncopyable();
bool isImplicit = !(isNoncopyable || resultDependsOnSelf);
bool isImplicit = !isNoncopyable;
bool useAddress =
rawElementTy->getAnyPointerElementType() && (isNoncopyable || resultDependsOnSelf);
rawElementTy->getAnyPointerElementType() && isNoncopyable;
auto result = new (ctx)
VarDecl(/*isStatic*/ false, VarDecl::Introducer::Var,