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

[move-only] Fix lazily initialized global initializers.

Browse Source 
Without this, we emit a copy of noncopyable type error since we do not insert a
mark_must_check on lazily initialized global initializers.

rdar://111402912
This commit is contained in:
Michael Gottesman
2023-07-17 19:14:10 -07:00
parent 34014eccd4
commit 1f22f92170
4 changed files with 118 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/SILGen/SILGenLValue.cpp
View File

@@ -1085,13 +1085,17 @@ namespace {
ManagedValue Value;
llvm::Optional<SILAccessEnforcement> Enforcement;
bool IsRValue;
bool IsLazyInitializedGlobal;
public:
ValueComponent(ManagedValue value,
llvm::Optional<SILAccessEnforcement> enforcement,
LValueTypeData typeData, bool isRValue = false,
llvm::Optional<ActorIsolation> actorIso = llvm::None)
llvm::Optional<ActorIsolation> actorIso = llvm::None,
bool isLazyInitializedGlobal = false)
: PhysicalPathComponent(typeData, ValueKind, actorIso), Value(value),
Enforcement(enforcement), IsRValue(isRValue) {
Enforcement(enforcement), IsRValue(isRValue),
IsLazyInitializedGlobal(isLazyInitializedGlobal) {
assert(IsRValue || value.getType().isAddress() ||
value.getType().isBoxedNonCopyableType(value.getFunction()));
}
@@ -1106,7 +1110,7 @@ namespace {
if (Value.getType().isAddress() && Value.getType().isMoveOnly()) {
SILValue addr = Value.getValue();
auto box = dyn_cast<ProjectBoxInst>(addr);
if (box || isa<GlobalAddrInst>(addr)) {
if (box || isa<GlobalAddrInst>(addr) || IsLazyInitializedGlobal) {
if (Enforcement)
addr = enterAccessScope(SGF, loc, base, addr, getTypeData(),
getAccessKind(), *Enforcement,
@@ -3228,9 +3232,12 @@ void LValue::addNonMemberVarComponent(
auto astAccessKind = mapAccessKind(this->AccessKind);
auto address = SGF.maybeEmitValueOfLocalVarDecl(Storage, astAccessKind);
bool isLazyInitializedGlobal = false;
// The only other case that should get here is a global variable.
if (!address) {
address = SGF.emitGlobalVariableRef(Loc, Storage, ActorIso);
address = SGF.emitGlobalVariableRef(Loc, Storage, ActorIso);
isLazyInitializedGlobal = Storage->isLazilyInitializedGlobal();
} else {
assert((!ActorIso || Storage->isTopLevelGlobal()) &&
"local var should not be actor isolated!");
@@ -3256,7 +3263,8 @@ void LValue::addNonMemberVarComponent(
}
LV.add<ValueComponent>(address, enforcement, typeData,
/*isRValue=*/false, ActorIso);
/*isRValue=*/false, ActorIso,
isLazyInitializedGlobal);
if (address.getType().is<ReferenceStorageType>())
LV.add<OwnershipComponent>(typeData);