Merge pull request #6922 from atrick/silconv

This commit is contained in:
swift-ci
2017-01-26 16:35:08 -08:00
committed by GitHub
85 changed files with 1815 additions and 1269 deletions

View File

@@ -416,7 +416,7 @@ void ConformanceCollector::collect(swift::SILInstruction *I) {
CanSILFunctionType SubstFnTy = AS.getSubstCalleeType();
scanFuncParams(OrigFnTy->getParameters(), SubstFnTy->getParameters());
scanFuncParams(OrigFnTy->getAllResults(), SubstFnTy->getAllResults());
scanFuncParams(OrigFnTy->getResults(), SubstFnTy->getResults());
if (OrigFnTy->getRepresentation() ==
SILFunctionType::Representation::WitnessMethod) {