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

Fix issues with the AddressLowering pass

Browse Source 
Override the current SILModuleConvention of the SILModule when we perform the address lowering.
This commit is contained in:
Roman Levenstein
2017-05-10 11:59:43 -07:00
parent 6402d3d97d
commit 946b1d4225
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/SIL/SILInstructions.cpp
View File

@@ -408,19 +408,24 @@ ApplyInst::ApplyInst(SILDebugLocation Loc, SILValue Callee,
ApplyInst *ApplyInst::create(SILDebugLocation Loc, SILValue Callee,
SubstitutionList Subs, ArrayRef<SILValue> Args,
bool isNonThrowing, SILFunction &F,
bool isNonThrowing,
Optional<SILModuleConventions> ModuleConventions,
SILFunction &F,
SILOpenedArchetypesState &OpenedArchetypes) {
SILType SubstCalleeTy =
SILType SubstCalleeSILTy =
Callee->getType().substGenericArgs(F.getModule(), Subs);
SILFunctionConventions Conv(SubstCalleeTy.getAs<SILFunctionType>(),
F.getModule());
auto SubstCalleeTy = SubstCalleeSILTy.getAs<SILFunctionType>();
SILFunctionConventions Conv(SubstCalleeTy,
ModuleConventions.hasValue()
? ModuleConventions.getValue()
: SILModuleConventions(F.getModule()));
SILType Result = Conv.getSILResultType();
SmallVector<SILValue, 32> TypeDependentOperands;
collectTypeDependentOperands(TypeDependentOperands, OpenedArchetypes, F,
SubstCalleeTy.getSwiftRValueType(), Subs);
SubstCalleeSILTy.getSwiftRValueType(), Subs);
void *Buffer = allocate(F, Subs, TypeDependentOperands, Args);
return ::new(Buffer) ApplyInst(Loc, Callee, SubstCalleeTy,
return ::new(Buffer) ApplyInst(Loc, Callee, SubstCalleeSILTy,
Result, Subs, Args,
TypeDependentOperands, isNonThrowing);
}