maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert support for insertvalue and extractvalue instructions for the moment. 

GVN expects that all inputs which to an instruction fall somewhere in the value
hierarchy, which isn't true for these.

llvm-svn: 52496
This commit is contained in:
Owen Anderson 2008-06-19 17:25:39 +00:00
parent 6f880690b8
commit 45d3701fce
1 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
llvm/lib/Transforms/Scalar/GVN.cpp
View File

@ -59,7 +59,7 @@ namespace {
SHUFFLE, SELECT, TRUNC, ZEXT, SEXT, FPTOUI,
FPTOSI, UITOFP, SITOFP, FPTRUNC, FPEXT,
PTRTOINT, INTTOPTR, BITCAST, GEP, CALL, CONSTANT,
EXTRACTVALUE, INSERTVALUE, EMPTY, TOMBSTONE };
EMPTY, TOMBSTONE };
ExpressionOpcode opcode;
const Type* type;
@ -150,8 +150,6 @@ namespace {
Expression create_expression(GetElementPtrInst* G);
Expression create_expression(CallInst* C);
Expression create_expression(Constant* C);
Expression create_expression(InsertValueInst* I);
Expression create_expression(ExtractValueInst* I);
public:
ValueTable() : nextValueNumber(1) { }
uint32_t lookup_or_add(Value* V);
@ -286,40 +284,6 @@ Expression::ExpressionOpcode ValueTable::getOpcode(CastInst* C) {
}
}
Expression ValueTable::create_expression(InsertValueInst* I) {
Expression e;
e.type = I->getType();
e.firstVN = lookup_or_add(I->getOperand(0));
e.secondVN = lookup_or_add(I->getOperand(1));
e.thirdVN = 0;
e.function = 0;
e.opcode = Expression::INSERTVALUE;
for (InsertValueInst::op_iterator OI = I->op_begin()+2,
OE = I->op_end(); OI != OE; ++OI)
e.varargs.push_back(lookup_or_add(I));
return e;
}
Expression ValueTable::create_expression(ExtractValueInst* I) {
Expression e;
e.type = I->getType();
e.firstVN = lookup_or_add(I->getOperand(0));
e.secondVN = lookup_or_add(I->getOperand(1));
e.thirdVN = 0;
e.function = 0;
e.opcode = Expression::EXTRACTVALUE;
for (InsertValueInst::op_iterator OI = I->op_begin()+2,
OE = I->op_end(); OI != OE; ++OI)
e.varargs.push_back(lookup_or_add(I));
return e;
}
Expression ValueTable::create_expression(CallInst* C) {
Expression e;
@ -575,32 +539,6 @@ uint32_t ValueTable::lookup_or_add(Value* V) {
} else {
valueNumbering.insert(std::make_pair(V, nextValueNumber));
return nextValueNumber++;
}
} else if (InsertValueInst* II = dyn_cast<InsertValueInst>(V)) {
Expression e = create_expression(II);
DenseMap<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
if (EI != expressionNumbering.end()) {
valueNumbering.insert(std::make_pair(V, EI->second));
return EI->second;
} else {
expressionNumbering.insert(std::make_pair(e, nextValueNumber));
valueNumbering.insert(std::make_pair(V, nextValueNumber));
return nextValueNumber++;
}
} else if (ExtractValueInst* E = dyn_cast<ExtractValueInst>(V)) {
Expression e = create_expression(E);
DenseMap<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
if (EI != expressionNumbering.end()) {
valueNumbering.insert(std::make_pair(V, EI->second));
return EI->second;
} else {
expressionNumbering.insert(std::make_pair(e, nextValueNumber));
valueNumbering.insert(std::make_pair(V, nextValueNumber));
return nextValueNumber++;
}
} else if (BinaryOperator* BO = dyn_cast<BinaryOperator>(V)) {