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

Revert "New SIL instructions to support tail-allocated arrays in SIL."

Browse Source
This commit is contained in:
Dmitri Gribenko
2016-09-15 00:25:25 -07:00
committed by GitHub
parent cd07c2c125
commit fbb3cf35a5
68 changed files with 1145 additions and 1470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Serialization/SerializeSIL.cpp
View File

@@ -650,28 +650,14 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
case ValueKind::AllocRefInst: {
const AllocRefInst *ARI = cast<AllocRefInst>(&SI);
unsigned abbrCode = SILAbbrCodes[SILOneTypeValuesLayout::Code];
SmallVector<ValueID, 4> Args;
Args.push_back((unsigned)ARI->isObjC() |
((unsigned)ARI->canAllocOnStack() << 1));
ArrayRef<SILType> TailTypes = ARI->getTailAllocatedTypes();
ArrayRef<Operand> TailCounts = ARI->getTailAllocatedCounts();
unsigned NumTailAllocs = TailTypes.size();
assert(TailCounts.size() == NumTailAllocs);
for (unsigned Idx = 0; Idx < NumTailAllocs; ++Idx) {
assert(TailTypes[Idx].isObject());
Args.push_back(S.addTypeRef(TailTypes[Idx].getSwiftRValueType()));
SILValue CountVal = TailCounts[Idx].get();
Args.push_back(addValueRef(CountVal));
SILType CountType = CountVal->getType();
assert(CountType.isObject());
Args.push_back(S.addTypeRef(CountType.getSwiftRValueType()));
}
ValueID Args[1] = { (unsigned)ARI->isObjC() |
((unsigned)ARI->canAllocOnStack() << 1) };
SILOneTypeValuesLayout::emitRecord(Out, ScratchRecord, abbrCode,
(unsigned)SI.getKind(),
S.addTypeRef(
ARI->getType().getSwiftRValueType()),
(unsigned)ARI->getType().getCategory(),
Args);
llvm::makeArrayRef(Args));
break;
}
case ValueKind::AllocRefDynamicInst: {
@@ -1082,18 +1068,6 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
addValueRef(operand2));
break;
}
case ValueKind::TailAddrInst: {
const TailAddrInst *TAI = cast<TailAddrInst>(&SI);
SILTailAddrLayout::emitRecord(Out, ScratchRecord,
SILAbbrCodes[SILTailAddrLayout::Code],
(unsigned)SI.getKind(),
S.addTypeRef(TAI->getBase()->getType().getSwiftRValueType()),
addValueRef(TAI->getBase()),
S.addTypeRef(TAI->getIndex()->getType().getSwiftRValueType()),
addValueRef(TAI->getIndex()),
S.addTypeRef(TAI->getTailType().getSwiftRValueType()));
break;
}
case ValueKind::StringLiteralInst: {
auto SLI = cast<StringLiteralInst>(&SI);
StringRef Str = SLI->getValue();
@@ -1370,13 +1344,6 @@ void SILSerializer::writeSILInstruction(const SILInstruction &SI) {
addValueRef(operand));
break;
}
case ValueKind::RefTailAddrInst: {
auto *RTAI = cast<RefTailAddrInst>(&SI);
writeOneTypeOneOperandLayout(RTAI->getKind(), 0,
RTAI->getType(),
RTAI->getOperand());
break;
}
case ValueKind::StructInst: {
// Format: a type followed by a list of typed values. A typed value is
// expressed by 4 IDs: TypeID, TypeCategory, ValueID, ValueResultNumber.
@@ -1846,7 +1813,6 @@ void SILSerializer::writeSILBlock(const SILModule *SILMod) {
registerSILAbbr<SILInitExistentialLayout>();
registerSILAbbr<SILOneTypeValuesLayout>();
registerSILAbbr<SILTwoOperandsLayout>();
registerSILAbbr<SILTailAddrLayout>();
registerSILAbbr<SILInstApplyLayout>();
registerSILAbbr<SILInstNoOperandLayout>();