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

98
lib/Parse/ParseSIL.cpp
View File

@@ -1261,7 +1261,6 @@ bool SILParser::parseSILOpcode(ValueKind &Opcode, SourceLoc &OpcodeLoc,
.Case("existential_metatype", ValueKind::ExistentialMetatypeInst)
.Case("raw_pointer_to_ref", ValueKind::RawPointerToRefInst)
.Case("ref_element_addr", ValueKind::RefElementAddrInst)
.Case("ref_tail_addr", ValueKind::RefTailAddrInst)
.Case("ref_to_bridge_object", ValueKind::RefToBridgeObjectInst)
.Case("ref_to_raw_pointer", ValueKind::RefToRawPointerInst)
.Case("ref_to_unmanaged", ValueKind::RefToUnmanagedInst)
@@ -1291,7 +1290,6 @@ bool SILParser::parseSILOpcode(ValueKind &Opcode, SourceLoc &OpcodeLoc,
.Case("switch_enum_addr",
ValueKind::SwitchEnumAddrInst)
.Case("switch_value", ValueKind::SwitchValueInst)
.Case("tail_addr", ValueKind::TailAddrInst)
.Case("try_apply", ValueKind::TryApplyInst)
.Case("unchecked_enum_data", ValueKind::UncheckedEnumDataInst)
.Case("unchecked_addr_cast", ValueKind::UncheckedAddrCastInst)
@@ -2564,7 +2562,20 @@ bool SILParser::parseSILInstruction(SILBasicBlock *BB, SILBuilder &B) {
break;
}
case ValueKind::AllocStackInst:
case ValueKind::AllocRefInst:
case ValueKind::MetatypeInst: {
bool IsObjC = false;
bool OnStack = false;
StringRef Optional;
while (parseSILOptional(Optional, *this)) {
if (Optional == "objc") {
IsObjC = true;
} else if (Optional == "stack") {
OnStack = true;
} else {
return true;
}
}
SILType Ty;
if (parseSILType(Ty))
@@ -2576,6 +2587,10 @@ bool SILParser::parseSILInstruction(SILBasicBlock *BB, SILBuilder &B) {
parseSILDebugLocation(InstLoc, B))
return true;
ResultVal = B.createAllocStack(InstLoc, Ty, VarInfo);
} else if (Opcode == ValueKind::AllocRefInst) {
if (parseSILDebugLocation(InstLoc, B))
return true;
ResultVal = B.createAllocRef(InstLoc, Ty, IsObjC, OnStack);
} else {
assert(Opcode == ValueKind::MetatypeInst);
if (parseSILDebugLocation(InstLoc, B))
@@ -2584,59 +2599,6 @@ bool SILParser::parseSILInstruction(SILBasicBlock *BB, SILBuilder &B) {
}
break;
}
case ValueKind::AllocRefInst: {
bool IsObjC = false;
bool OnStack = false;
SmallVector<SILType, 2> ElementTypes;
SmallVector<SILValue, 2> ElementCounts;
StringRef Optional;
while (P.consumeIf(tok::l_square)) {
Identifier Id;
parseSILIdentifier(Id, diag::expected_in_attribute_list);
StringRef Optional = Id.str();
if (Optional == "objc") {
IsObjC = true;
} else if (Optional == "stack") {
OnStack = true;
} else if (Optional == "tail_elems") {
SILType ElemTy;
if (parseSILType(ElemTy) ||
!P.Tok.isAnyOperator() ||
P.Tok.getText() != "*")
return true;
P.consumeToken();
SILValue ElemCount;
if (parseTypedValueRef(ElemCount, B))
return true;
ElementTypes.push_back(ElemTy);
ElementCounts.push_back(ElemCount);
} else {
return true;
}
P.parseToken(tok::r_square, diag::expected_in_attribute_list);
}
SILType ObjectType;
if (parseSILType(ObjectType))
return true;
if (parseSILDebugLocation(InstLoc, B))
return true;
if (ElementTypes.size() == 0) {
ResultVal = B.createAllocRef(InstLoc, ObjectType, IsObjC, OnStack);
} else {
if (IsObjC) {
P.diagnose(P.Tok, diag::sil_objc_with_tail_elements);
return true;
}
ResultVal = B.createAllocRef(InstLoc, ObjectType, OnStack,
ElementTypes, ElementCounts);
}
break;
}
case ValueKind::AllocRefDynamicInst: {
SILType Ty;
bool isObjC = false;
@@ -3203,18 +3165,6 @@ bool SILParser::parseSILInstruction(SILBasicBlock *BB, SILBuilder &B) {
ResultVal = B.createRefElementAddr(InstLoc, Val, Field, ResultTy);
break;
}
case ValueKind::RefTailAddrInst: {
SourceLoc NameLoc;
SILType ResultObjTy;
if (parseTypedValueRef(Val, B) ||
P.parseToken(tok::comma, diag::expected_tok_in_sil_instr, ",") ||
parseSILType(ResultObjTy) ||
parseSILDebugLocation(InstLoc, B))
return true;
SILType ResultTy = ResultObjTy.getAddressType();
ResultVal = B.createRefTailAddr(InstLoc, Val, ResultTy);
break;
}
case ValueKind::IsNonnullInst: {
SourceLoc Loc;
if (parseTypedValueRef(Val, Loc, B) ||
@@ -3233,20 +3183,6 @@ bool SILParser::parseSILInstruction(SILBasicBlock *BB, SILBuilder &B) {
ResultVal = B.createIndexAddr(InstLoc, Val, IndexVal);
break;
}
case ValueKind::TailAddrInst: {
SILValue IndexVal;
SILType ResultObjTy;
if (parseTypedValueRef(Val, B) ||
P.parseToken(tok::comma, diag::expected_tok_in_sil_instr, ",") ||
parseTypedValueRef(IndexVal, B) ||
P.parseToken(tok::comma, diag::expected_tok_in_sil_instr, ",") ||
parseSILType(ResultObjTy) ||
parseSILDebugLocation(InstLoc, B))
return true;
SILType ResultTy = ResultObjTy.getAddressType();
ResultVal = B.createTailAddr(InstLoc, Val, IndexVal, ResultTy);
break;
}
case ValueKind::IndexRawPointerInst: {
SILValue IndexVal;
if (parseTypedValueRef(Val, B) ||