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] Scope argument cleanups with a new scope called "ArgumentScope".

Browse Source 
Once this is in, I will be able to finish the SILGenApply part of Semantic SIL.

rdar://30955427
This commit is contained in:
Michael Gottesman
2017-03-18 16:40:38 -07:00
parent f61612cc4e
commit b99c47c006
14 changed files with 152 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/SILGen/SILGenApply.cpp
View File

@@ -10,6 +10,7 @@
//
//===----------------------------------------------------------------------===//
#include "ArgumentScope.h"
#include "ArgumentSource.h"
#include "Callee.h"
#include "FormalEvaluation.h"
@@ -1695,7 +1696,8 @@ static bool hasUnownedInnerPointerResult(CanSILFunctionType fnType) {
/// lowered appropriately for the abstraction level but that the
/// result does need to be turned back into something matching a
/// formal type.
RValue SILGenFunction::emitApply(ResultPlanPtr &&resultPlan, SILLocation loc,
RValue SILGenFunction::emitApply(ResultPlanPtr &&resultPlan,
ArgumentScope &&argScope, SILLocation loc,
ManagedValue fn, SubstitutionList subs,
ArrayRef<ManagedValue> args,
const CalleeTypeInfo &calleeTypeInfo,
@@ -1765,6 +1767,9 @@ RValue SILGenFunction::emitApply(ResultPlanPtr &&resultPlan, SILLocation loc,
substFnType, options,
indirectResultAddrs);
// Pop the argument scope.
argScope.pop();
// Explode the direct results.
SILFunctionConventions substFnConv(substFnType, SGM.M);
SmallVector<ManagedValue, 4> directResults;
@@ -1877,8 +1882,9 @@ RValue SILGenFunction::emitMonomorphicApply(SILLocation loc,
resultType, foreignError, overrideRep);
ResultPlanPtr resultPlan = ResultPlanBuilder::computeResultPlan(
*this, calleeTypeInfo, loc, evalContext);
return emitApply(std::move(resultPlan), loc, fn, {}, args, calleeTypeInfo,
options, evalContext);
ArgumentScope argScope(*this, loc);
return emitApply(std::move(resultPlan), std::move(argScope), loc, fn, {},
args, calleeTypeInfo, options, evalContext);
}
/// Count the number of SILParameterInfos that are needed in order to
@@ -3785,6 +3791,7 @@ RValue CallEmission::applyNormalCall(
uncurriedSites.back().getSubstResultType(), foreignError);
ResultPlanPtr resultPlan = ResultPlanBuilder::computeResultPlan(
SGF, calleeTypeInfo, uncurriedSites.back().Loc, uncurriedContext);
ArgumentScope argScope(SGF, uncurriedSites.back().Loc);
// Now that we know the substFnType, check if we assumed that we were
// passing self at +0. If we did and self is not actually passed at +0,
@@ -3809,9 +3816,10 @@ RValue CallEmission::applyNormalCall(
initialOptions, uncurriedArgs, uncurriedLoc,
formalApplyType);
// Emit the uncurried call.
return SGF.emitApply(std::move(resultPlan), uncurriedLoc.getValue(), mv,
callee.getSubstitutions(), uncurriedArgs, calleeTypeInfo,
initialOptions, uncurriedContext);
return SGF.emitApply(std::move(resultPlan), std::move(argScope),
uncurriedLoc.getValue(), mv, callee.getSubstitutions(),
uncurriedArgs, calleeTypeInfo, initialOptions,
uncurriedContext);
}
RValue CallEmission::applyEnumElementConstructor(
@@ -4162,6 +4170,7 @@ RValue CallEmission::applyRemainingCallSites(
foreignError);
ResultPlanPtr resultPtr =
ResultPlanBuilder::computeResultPlan(SGF, calleeTypeInfo, loc, context);
ArgumentScope argScope(SGF, loc);
std::move(extraSites[i])
.emit(SGF, origParamType, paramLowering, siteArgs, inoutArgs,
@@ -4172,8 +4181,9 @@ RValue CallEmission::applyRemainingCallSites(
ApplyOptions options = ApplyOptions::None;
result = SGF.emitApply(std::move(resultPtr), loc, functionMV, {}, siteArgs,
calleeTypeInfo, options, context);
result = SGF.emitApply(std::move(resultPtr), std::move(argScope), loc,
functionMV, {}, siteArgs, calleeTypeInfo, options,
context);
}
return std::move(result);
@@ -4250,8 +4260,9 @@ SILGenFunction::emitApplyOfLibraryIntrinsic(SILLocation loc,
substFormalType.getResult());
ResultPlanPtr resultPlan =
ResultPlanBuilder::computeResultPlan(*this, calleeTypeInfo, loc, ctx);
return emitApply(std::move(resultPlan), loc, mv, subs, args, calleeTypeInfo,
options, ctx);
ArgumentScope argScope(*this, loc);
return emitApply(std::move(resultPlan), std::move(argScope), loc, mv, subs,
args, calleeTypeInfo, options, ctx);
}
static StringRef