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: remove multiple result values from SILValue

Browse Source 
As there are no instructions left which produce multiple result values, this is a NFC regarding the generated SIL and generated code.
Although this commit is large, most changes are straightforward adoptions to the changes in the ValueBase and SILValue classes.
This commit is contained in:
Erik Eckstein
2016-01-21 10:30:18 -08:00
parent e01fb6d587
commit 2db6f3d213
76 changed files with 949 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/SIL/Projection.cpp
View File

@@ -154,31 +154,31 @@ NewProjection::NewProjection(SILInstruction *I) : Value() {
break;
}
case ValueKind::UpcastInst: {
auto *Ty = I->getType(0).getSwiftRValueType().getPointer();
auto *Ty = I->getType().getSwiftRValueType().getPointer();
assert(Ty->isCanonical());
Value = ValueTy(NewProjectionKind::Upcast, Ty);
assert(getKind() == NewProjectionKind::Upcast);
assert(getType(I->getOperand(0).getType(), I->getModule()) ==
I->getType(0));
I->getType());
break;
}
case ValueKind::UncheckedRefCastInst: {
auto *Ty = I->getType(0).getSwiftRValueType().getPointer();
auto *Ty = I->getType().getSwiftRValueType().getPointer();
assert(Ty->isCanonical());
Value = ValueTy(NewProjectionKind::RefCast, Ty);
assert(getKind() == NewProjectionKind::RefCast);
assert(getType(I->getOperand(0).getType(), I->getModule()) ==
I->getType(0));
I->getType());
break;
}
case ValueKind::UncheckedBitwiseCastInst:
case ValueKind::UncheckedAddrCastInst: {
auto *Ty = I->getType(0).getSwiftRValueType().getPointer();
auto *Ty = I->getType().getSwiftRValueType().getPointer();
assert(Ty->isCanonical());
Value = ValueTy(NewProjectionKind::BitwiseCast, Ty);
assert(getKind() == NewProjectionKind::BitwiseCast);
assert(getType(I->getOperand(0).getType(), I->getModule()) ==
I->getType(0));
I->getType());
break;
}
}
@@ -489,7 +489,7 @@ NewProjectionPath::computeSubSeqRelation(const NewProjectionPath &RHS) const {
bool NewProjectionPath::findMatchingObjectProjectionPaths(
SILInstruction *I, SmallVectorImpl<SILInstruction *> &T) const {
// We only support unary instructions.
if (I->getNumOperands() != 1 || I->getNumTypes() != 1)
if (I->getNumOperands() != 1)
return false;
// Check that the base result type of I is equivalent to this types base path.
@@ -1529,7 +1529,7 @@ processUsersOfValue(ProjectionTree &Tree,
DEBUG(llvm::dbgs() << " Created projection.\n");
assert(User->getNumTypes() == 1 && "Projections should only have one use");
assert(User->hasValue() && "Projections should have a value");
// Look up the Node for this projection add {User, ChildNode} to the
// worklist.
@@ -1799,7 +1799,7 @@ createTreeFromValue(SILBuilder &B, SILLocation Loc, SILValue NewBase,
for (unsigned ChildIdx : reversed(Node->ChildProjections)) {
const ProjectionTreeNode *ChildNode = getNode(ChildIdx);
SILInstruction *I = ChildNode->createProjection(B, Loc, V).get();
DEBUG(llvm::dbgs() << " Adding Child: " << I->getType(0) << ": " << *I);
DEBUG(llvm::dbgs() << " Adding Child: " << I->getType() << ": " << *I);
Worklist.push_back(std::make_tuple(ChildNode, SILValue(I)));
}
} else {