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

[Serialization] witness_method should reference existing conformances.

Browse Source 
Part of a series of commits to remove redundantly-serialized conformances.

Swift SVN r22196
This commit is contained in:
Jordan Rose
2014-09-23 02:06:21 +00:00
parent eea6c17456
commit 82011c98ef
4 changed files with 75 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Serialization/DeserializeSIL.cpp
View File

@@ -614,6 +614,8 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
ValueID ValID, ValID2;
TypeID TyID, TyID2;
TypeID ConcreteTyID;
DeclID ProtoID;
ModuleID OwningModuleID;
SourceLoc SLoc;
ArrayRef<uint64_t> ListOfValues;
SILLocation Loc = SILFileLocation(SLoc);
@@ -673,6 +675,14 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
case SIL_INST_NO_OPERAND:
SILInstNoOperandLayout::readRecord(scratch, OpCode);
break;
case SIL_INST_WITNESS_METHOD:
SILInstWitnessMethodLayout::readRecord(scratch, TyID, TyCategory, Attr,
TyID2, TyCategory2,
ProtoID, ConcreteTyID,
OwningModuleID,
ListOfValues);
OpCode = (unsigned)ValueKind::WitnessMethodInst;
break;
}
ValueBase *ResultVal;
@@ -1362,7 +1372,6 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
ResultTy);
break;
}
case ValueKind::WitnessMethodInst:
case ValueKind::ProtocolMethodInst:
case ValueKind::ClassMethodInst:
case ValueKind::SuperMethodInst:
@@ -1370,8 +1379,6 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
// Format: a type, an operand and a SILDeclRef. Use SILOneTypeValuesLayout:
// type, Attr, SILDeclRef (DeclID, Kind, uncurryLevel, IsObjC),
// and an operand.
// WitnessMethodInst is additionally optionally followed by a
// ProtocolConformance record.
unsigned NextValueIndex = 1;
SILDeclRef DRef = getSILDeclRef(MF, ListOfValues, NextValueIndex);
SILType Ty = getSILType(MF->getType(TyID), (SILValueCategory)TyCategory);
@@ -1384,14 +1391,6 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
switch ((ValueKind)OpCode) {
default: assert(0 && "Out of sync with parent switch");
case ValueKind::WitnessMethodInst: {
auto conformance = MF->maybeReadConformance(Ty.getSwiftRValueType(),
SILCursor);
ResultVal = Builder.createWitnessMethod(Loc, Ty,
conformance.getValueOr(nullptr),
DRef, operandTy, IsVolatile);
break;
}
case ValueKind::ProtocolMethodInst:
ResultVal = Builder.createProtocolMethod(Loc,
getLocalValue(ListOfValues[NextValueIndex],
@@ -1419,6 +1418,24 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn, SILBasicBlock *BB,
}
break;
}
case ValueKind::WitnessMethodInst: {
unsigned NextValueIndex = 0;
SILDeclRef DRef = getSILDeclRef(MF, ListOfValues, NextValueIndex);
assert(ListOfValues.size() >= NextValueIndex &&
"Out of entries for MethodInst");
SILType Ty = getSILType(MF->getType(TyID), (SILValueCategory)TyCategory);
SILType OperandTy = getSILType(MF->getType(TyID2),
(SILValueCategory)TyCategory2);
auto *Proto = cast_or_null<ProtocolDecl>(MF->getDecl(ProtoID));
auto *Conformance = MF->readReferencedConformance(Proto, ConcreteTyID,
OwningModuleID,
SILCursor);
ResultVal = Builder.createWitnessMethod(Loc, Ty, Conformance, DRef,
OperandTy, Attr);
break;
}
case ValueKind::DynamicMethodBranchInst: {
// Format: a typed value, a SILDeclRef, a BasicBlock ID for method,
// a BasicBlock ID for no method. Use SILOneTypeValuesLayout.