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

SILGen: Copy block arguments, even if they're optional.

Browse Source 
Avoids creating a dangling stack block reference when working with imported APIs that take blocks as IUOs, fixing rdar://problem/18132853.

Swift SVN r21662
This commit is contained in:
Joe Groff
2014-09-02 23:56:27 +00:00
parent ecc5016094
commit 3c2f1657de
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/SILGen/RValue.cpp
View File

@@ -407,13 +407,16 @@ public:
? ManagedValue::forLValue(arg)
: gen.emitManagedRValueWithCleanup(arg);
// If the value is an ObjC block passed into the entry point of the
// function, copy it, so we can treat the value reliably
// If the value is a (possibly optional) ObjC block passed into the entry
// point of the function, then copy it so we can treat the value reliably
// as a heap object. Escape analysis can eliminate this copy if it's
// unneeded during optimization.
CanType objectType = t;
if (auto theObjTy = t.getAnyOptionalObjectType())
objectType = theObjTy;
if (functionArgs
&& isa<FunctionType>(t)
&& cast<FunctionType>(t)->getRepresentation()
&& isa<FunctionType>(objectType)
&& cast<FunctionType>(objectType)->getRepresentation()
== FunctionType::Representation::Block) {
SILValue blockCopy = gen.B.createCopyBlock(loc, mv.getValue());
mv = gen.emitManagedRValueWithCleanup(blockCopy);