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

SIL: Remove EnableTypedBoxes staging option.

Browse Source 
Swift SVN r29762
This commit is contained in:
Joe Groff
2015-06-27 18:10:12 +00:00
parent 8a04d67408
commit 9bdac157d2
14 changed files with 30 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/SILGen/SILGenFunction.cpp
View File

@@ -554,8 +554,6 @@ void SILGenFunction::emitArtificialTopLevel(ClassDecl *mainClass) {
static void forwardCaptureArgs(SILGenFunction &gen,
SmallVectorImpl<SILValue> &args,
CapturedValue capture) {
ASTContext &c = gen.getASTContext();
auto addSILArgument = [&](SILType t, ValueDecl *d) {
args.push_back(new (gen.SGM.M) SILArgument(gen.F.begin(), t, d));
};
@@ -574,12 +572,8 @@ static void forwardCaptureArgs(SILGenFunction &gen,
SILType ty = gen.getLoweredType(vd->getType()->getRValueType())
.getAddressType();
// Forward the captured owning box.
SILType boxTy;
if (gen.SGM.M.getOptions().EnableTypedBoxes)
boxTy = SILType::getPrimitiveObjectType(
SILType boxTy = SILType::getPrimitiveObjectType(
SILBoxType::get(ty.getSwiftRValueType()));
else
boxTy = SILType::getNativeObjectType(c);
addSILArgument(boxTy, vd);
// Forward the captured value address.
addSILArgument(ty, vd);