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

[SILOptimizer] fix KeyPathProjector memory management

Browse Source 
I was inconsistently providing initialized or uninitialized memory
to the callback when projecting a settable address, depending on
component type. We should always provide an uninitialized address.
This commit is contained in:
Jonathan Keller
2020-02-15 11:00:46 -08:00
parent a06fe96fd9
commit 1feead804b
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/SILOptimizer/Utils/KeyPathProjector.cpp
View File

@@ -34,6 +34,11 @@ public:
void project(AccessType accessType,
std::function<void (SILValue)> callback) override {
if (accessType == AccessType::Set) {
// We're setting the identity key path (\.self). The callback
// expects an uninitialized address, so destroy the old value.
builder.emitDestroyAddr(loc, root);
}
callback(root);
}
@@ -105,7 +110,11 @@ public:
parentAccessType = AccessType::Modify;
parent->project(parentAccessType, [&](SILValue parentValue) {
callback(builder.createStructElementAddr(loc, parentValue, storedProperty));
auto addr = builder.createStructElementAddr(loc, parentValue, storedProperty);
// If we're setting, destroy the old value (the callback expects uninitialized memory)
if (accessType == AccessType::Set)
builder.createDestroyAddr(loc, addr);
callback(addr);
});
} else {
// Accessing a class member -> reading the class
@@ -143,6 +152,9 @@ public:
addr = beginAccess;
}
// If we're setting, destroy the old value (the callback expects uninitialized memory)
if (accessType == AccessType::Set)
builder.createDestroyAddr(loc, addr);
callback(addr);
// if a child hasn't started a new access (i.e. beginAccess is unchanged),
@@ -178,8 +190,11 @@ public:
parentAccessType = AccessType::Modify;
parent->project(parentAccessType, [&](SILValue parentValue) {
callback(builder.createTupleElementAddr(loc, parentValue,
component.getTupleIndex()));
auto addr = builder.createTupleElementAddr(loc, parentValue, component.getTupleIndex());
// If we're setting, destroy the old value (the callback expects uninitialized memory)
if (accessType == AccessType::Set)
builder.createDestroyAddr(loc, addr);
callback(addr);
});
}
};