RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-30 16:53:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove use of ConstantExpr::getShift

Browse Source 
llvm-svn: 10792
This commit is contained in:
Chris Lattner 2004-01-12 19:10:58 +00:00
parent 758109ce2e
commit 47e9056669
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Transforms/Utils/Linker.cpp
View File

@ -324,12 +324,6 @@ static Value *RemapOperand(const Value *In,
assert(CE->getOpcode() == Instruction::Cast); assert(CE->getOpcode() == Instruction::Cast);
Value *V = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap); Value *V = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap);
Result = ConstantExpr::getCast(cast<Constant>(V), CE->getType()); Result = ConstantExpr::getCast(cast<Constant>(V), CE->getType());
} else if (CE->getOpcode() == Instruction::Shl ||
CE->getOpcode() == Instruction::Shr) { // Shift
Value *V1 = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap);
Value *V2 = RemapOperand(CE->getOperand(1), LocalMap, GlobalMap);
Result = ConstantExpr::getShift(CE->getOpcode(), cast<Constant>(V1),
cast<Constant>(V2));
} else if (CE->getNumOperands() == 2) { } else if (CE->getNumOperands() == 2) {
// Binary operator... // Binary operator...
Value *V1 = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap); Value *V1 = RemapOperand(CE->getOperand(0), LocalMap, GlobalMap);

5
lib/Transforms/Utils/Local.cpp
View File

@ -74,16 +74,13 @@ Constant *llvm::ConstantFoldInstruction(Instruction *I) {
case 0: return 0; case 0: return 0;
} }
if (isa<BinaryOperator>(I)) if (isa<BinaryOperator>(I) || isa<ShiftInst>(I))
return ConstantExpr::get(I->getOpcode(), Op0, Op1); return ConstantExpr::get(I->getOpcode(), Op0, Op1);
switch (I->getOpcode()) { switch (I->getOpcode()) {
default: return 0; default: return 0;
case Instruction::Cast: case Instruction::Cast:
return ConstantExpr::getCast(Op0, I->getType()); return ConstantExpr::getCast(Op0, I->getType());
case Instruction::Shl:
case Instruction::Shr:
return ConstantExpr::getShift(I->getOpcode(), Op0, Op1);
case Instruction::GetElementPtr: case Instruction::GetElementPtr:
std::vector<Constant*> IdxList; std::vector<Constant*> IdxList;
IdxList.reserve(I->getNumOperands()-1); IdxList.reserve(I->getNumOperands()-1);

6
lib/Transforms/Utils/ValueMapper.cpp
View File

@ -83,12 +83,6 @@ Value *llvm::MapValue(const Value *V, std::map<const Value*, Value*> &VM) {
for (unsigned i = 1, e = CE->getNumOperands(); i != e; ++i) for (unsigned i = 1, e = CE->getNumOperands(); i != e; ++i)
Idx.push_back(cast<Constant>(MapValue(CE->getOperand(i), VM))); Idx.push_back(cast<Constant>(MapValue(CE->getOperand(i), VM)));
return VMSlot = ConstantExpr::getGetElementPtr(MV, Idx); return VMSlot = ConstantExpr::getGetElementPtr(MV, Idx);
} else if (CE->getOpcode() == Instruction::Shl ||
CE->getOpcode() == Instruction::Shr) {
assert(CE->getNumOperands() == 2 && "Must be a shift!");
Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM));
Constant *MV2 = cast<Constant>(MapValue(CE->getOperand(1), VM));
return VMSlot = ConstantExpr::getShift(CE->getOpcode(), MV1, MV2);
} else { } else {
assert(CE->getNumOperands() == 2 && "Must be binary operator?"); assert(CE->getNumOperands() == 2 && "Must be binary operator?");
Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM)); Constant *MV1 = cast<Constant>(MapValue(CE->getOperand(0), VM));