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

SILGen: Turn static collectParams() function into a method on SILGenFunction, NFC

Browse Source
This commit is contained in:
Slava Pestov
2016-01-10 17:03:19 -08:00
parent b70e4d2aad
commit 218792959d
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/SILGen/SILGenPoly.cpp
View File

@@ -650,18 +650,16 @@ static ManagedValue manageParam(SILGenFunction &gen,
llvm_unreachable("bad parameter convention");
}
static void collectParams(SILGenFunction &gen,
SILLocation loc,
SmallVectorImpl<ManagedValue> &params,
bool allowPlusZero) {
void SILGenFunction::collectThunkParams(SILLocation loc,
SmallVectorImpl<ManagedValue> &params,
bool allowPlusZero) {
auto paramTypes =
gen.F.getLoweredFunctionType()->getParametersWithoutIndirectResult();
F.getLoweredFunctionType()->getParametersWithoutIndirectResult();
for (auto param : paramTypes) {
auto paramTy = gen.F.mapTypeIntoContext(param.getSILType());
auto paramValue = new (gen.SGM.M) SILArgument(gen.F.begin(),
paramTy);
params.push_back(manageParam(gen, loc, paramValue, param, allowPlusZero));
auto paramTy = F.mapTypeIntoContext(param.getSILType());
auto paramValue = new (SGM.M) SILArgument(F.begin(), paramTy);
auto paramMV = manageParam(*this, loc, paramValue, param, allowPlusZero);
params.push_back(paramMV);
}
}
@@ -1332,7 +1330,7 @@ static void buildThunkBody(SILGenFunction &gen, SILLocation loc,
SmallVector<ManagedValue, 8> params;
// TODO: Could accept +0 arguments here when forwardFunctionArguments/
// emitApply can.
collectParams(gen, loc, params, /*allowPlusZero*/ false);
gen.collectThunkParams(loc, params, /*allowPlusZero*/ false);
ManagedValue fnValue = params.pop_back_val();
auto fnType = fnValue.getType().castTo<SILFunctionType>();
@@ -1683,7 +1681,7 @@ SILGenFunction::emitVTableThunk(SILDeclRef derived,
}
SmallVector<ManagedValue, 8> thunkArgs;
collectParams(*this, loc, thunkArgs, /*allowPlusZero*/ true);
collectThunkParams(loc, thunkArgs, /*allowPlusZero*/ true);
SmallVector<ManagedValue, 8> substArgs;
// If the thunk and implementation share an indirect result type, use it
@@ -1826,7 +1824,7 @@ void SILGenFunction::emitProtocolWitness(ProtocolConformance *conformance,
SmallVector<ManagedValue, 8> origParams;
// TODO: Should be able to accept +0 values here, once
// forwardFunctionArguments/emitApply are able to.
collectParams(*this, loc, origParams, /*allowPlusZero*/ false);
collectThunkParams(loc, origParams, /*allowPlusZero*/ false);
// Handle special abstraction differences in "self".
// If the witness is a free function, drop it completely.