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

SIL Serialization: handle more SILInstructins.

Browse Source 
Handle the following SILInstructions:
DeallocBoxInst ArchetypeMetatypeInst ClassMetatypeInst ProtocolMetatypeInst
AllocRefInst DeallocRefInst StoreWeakInst AssignInst

Add an optional 2-bit field for instruction attributes to
SILOneValueOneOperandLayout.


Swift SVN r8418
This commit is contained in:
Manman Ren
2013-09-18 21:03:01 +00:00
parent 3fbfded756
commit 6eab362023
3 changed files with 131 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
lib/Serialization/SerializeSIL.cpp
View File

@@ -182,17 +182,45 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
(unsigned)SI.getKind());
break;
}
case ValueKind::DeallocBoxInst:
case ValueKind::ArchetypeMetatypeInst:
case ValueKind::ClassMetatypeInst:
case ValueKind::ProtocolMetatypeInst:
case ValueKind::AllocArrayInst: {
const AllocArrayInst *AAI = cast<AllocArrayInst>(&SI);
SILValue operand;
SILType Ty;
switch (SI.getKind()) {
default: assert(0 && "Out of sync with parent switch");
case ValueKind::ArchetypeMetatypeInst:
operand = cast<ArchetypeMetatypeInst>(&SI)->getOperand();
Ty = cast<ArchetypeMetatypeInst>(&SI)->getType();
break;
case ValueKind::ClassMetatypeInst:
operand = cast<ClassMetatypeInst>(&SI)->getOperand();
Ty = cast<ClassMetatypeInst>(&SI)->getType();
break;
case ValueKind::ProtocolMetatypeInst:
operand = cast<ProtocolMetatypeInst>(&SI)->getOperand();
Ty = cast<ProtocolMetatypeInst>(&SI)->getType();
break;
case ValueKind::DeallocBoxInst:
operand = cast<DeallocBoxInst>(&SI)->getOperand();
Ty = cast<DeallocBoxInst>(&SI)->getElementType();
break;
case ValueKind::AllocArrayInst:
operand = cast<AllocArrayInst>(&SI)->getNumElements();
Ty = cast<AllocArrayInst>(&SI)->getElementType();
break;
}
unsigned abbrCode = SILAbbrCodes[SILOneTypeOneOperandLayout::Code];
SILOneTypeOneOperandLayout::emitRecord(Out, ScratchRecord, abbrCode,
(unsigned)SI.getKind(), 0,
S.addTypeRef(AAI->getElementType().getSwiftRValueType()),
(unsigned)AAI->getElementType().getCategory(),
S.addTypeRef(AAI->getNumElements().getType().getSwiftRValueType()),
(unsigned)AAI->getNumElements().getType().getCategory(),
addValueRef(AAI->getNumElements()),
AAI->getNumElements().getResultNumber());
S.addTypeRef(Ty.getSwiftRValueType()),
(unsigned)Ty.getCategory(),
S.addTypeRef(operand.getType().getSwiftRValueType()),
(unsigned)operand.getType().getCategory(),
addValueRef(operand),
operand.getResultNumber());
break;
}
case ValueKind::AllocBoxInst: {
@@ -204,6 +232,15 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
(unsigned)ABI->getElementType().getCategory());
break;
}
case ValueKind::AllocRefInst: {
const AllocRefInst *ARI = cast<AllocRefInst>(&SI);
unsigned abbrCode = SILAbbrCodes[SILOneTypeLayout::Code];
SILOneTypeLayout::emitRecord(Out, ScratchRecord, abbrCode,
(unsigned)SI.getKind(),
S.addTypeRef(ARI->getType().getSwiftRValueType()),
(unsigned)ARI->getType().getCategory());
break;
}
case ValueKind::AllocStackInst: {
const AllocStackInst *ASI = cast<AllocStackInst>(&SI);
unsigned abbrCode = SILAbbrCodes[SILOneTypeLayout::Code];
@@ -260,6 +297,7 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
break;
}
case ValueKind::DeallocStackInst:
case ValueKind::DeallocRefInst:
case ValueKind::DestroyAddrInst:
case ValueKind::LoadInst:
case ValueKind::LoadWeakInst:
@@ -525,16 +563,32 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
addValueRef(operand), operand.getResultNumber());
break;
}
case ValueKind::StoreInst: {
const StoreInst *StI = cast<StoreInst>(&SI);
case ValueKind::AssignInst:
case ValueKind::StoreInst:
case ValueKind::StoreWeakInst: {
SILValue operand, value;
unsigned Attr = 0;
if (SI.getKind() == ValueKind::StoreWeakInst) {
Attr = cast<StoreWeakInst>(&SI)->isInitializationOfDest();
operand = cast<StoreWeakInst>(&SI)->getDest();
value = cast<StoreWeakInst>(&SI)->getSrc();
} else if (SI.getKind() == ValueKind::StoreInst) {
operand = cast<StoreInst>(&SI)->getDest();
value = cast<StoreInst>(&SI)->getSrc();
} else if (SI.getKind() == ValueKind::AssignInst) {
operand = cast<AssignInst>(&SI)->getDest();
value = cast<AssignInst>(&SI)->getSrc();
} else
llvm_unreachable("switch out of sync");
unsigned abbrCode = SILAbbrCodes[SILOneValueOneOperandLayout::Code];
SILOneValueOneOperandLayout::emitRecord(Out, ScratchRecord, abbrCode,
(unsigned)SI.getKind(), addValueRef(StI->getSrc()),
StI->getSrc().getResultNumber(),
S.addTypeRef(StI->getDest().getType().getSwiftRValueType()),
(unsigned)StI->getDest().getType().getCategory(),
addValueRef(StI->getDest()),
StI->getDest().getResultNumber());
(unsigned)SI.getKind(), Attr, addValueRef(value),
value.getResultNumber(),
S.addTypeRef(operand.getType().getSwiftRValueType()),
(unsigned)operand.getType().getCategory(),
addValueRef(operand),
operand.getResultNumber());
break;
}
case ValueKind::StructExtractInst: {
@@ -543,7 +597,7 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
const StructExtractInst *SEI = cast<StructExtractInst>(&SI);
SILOneValueOneOperandLayout::emitRecord(Out, ScratchRecord,
SILAbbrCodes[SILOneValueOneOperandLayout::Code],
(unsigned)SI.getKind(), S.addDeclRef(SEI->getField()), 0,
(unsigned)SI.getKind(), 0, S.addDeclRef(SEI->getField()), 0,
S.addTypeRef(SEI->getOperand().getType().getSwiftRValueType()),
(unsigned)SEI->getOperand().getType().getCategory(),
addValueRef(SEI->getOperand()), SEI->getOperand().getResultNumber());