diff options
| author | Nate Begeman <natebegeman@mac.com> | 2008-05-12 20:11:05 +0000 |
|---|---|---|
| committer | Nate Begeman <natebegeman@mac.com> | 2008-05-12 20:11:05 +0000 |
| commit | 66d0a0e8f43af6366476cacb73b1b2e3f207fab4 (patch) | |
| tree | 09db188046e371b1982dde76dbb208d4f4ad59f7 | |
| parent | 5f52142ee0ae32b4da58c2c5f52cc4b7b3971e15 (diff) | |
| download | bcm5719-llvm-66d0a0e8f43af6366476cacb73b1b2e3f207fab4.tar.gz bcm5719-llvm-66d0a0e8f43af6366476cacb73b1b2e3f207fab4.zip | |
Pointer comparisons should be handled by icmp, not vicmp :)
llvm-svn: 50994
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/VMCore/Instructions.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 2ca7a00e035..d9936ef825a 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1359,7 +1359,7 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { OpNum+1 != Record.size()) return Error("Invalid CMP record"); - if (LHS->getType()->isInteger()) + if (LHS->getType()->isInteger() || isa<PointerType>(LHS->getType())) I = new ICmpInst((ICmpInst::Predicate)Record[OpNum], LHS, RHS); else if (LHS->getType()->isFloatingPoint()) I = new FCmpInst((FCmpInst::Predicate)Record[OpNum], LHS, RHS); diff --git a/llvm/lib/VMCore/Instructions.cpp b/llvm/lib/VMCore/Instructions.cpp index 7650ce48069..d34aa593198 100644 --- a/llvm/lib/VMCore/Instructions.cpp +++ b/llvm/lib/VMCore/Instructions.cpp @@ -2335,7 +2335,7 @@ BitCastInst::BitCastInst( CmpInst::CmpInst(const Type *ty, OtherOps op, unsigned short predicate, Value *LHS, Value *RHS, const std::string &Name, Instruction *InsertBefore) - : Instruction(Type::Int1Ty, op, + : Instruction(ty, op, OperandTraits<CmpInst>::op_begin(this), OperandTraits<CmpInst>::operands(this), InsertBefore) { @@ -2348,7 +2348,7 @@ CmpInst::CmpInst(const Type *ty, OtherOps op, unsigned short predicate, CmpInst::CmpInst(const Type *ty, OtherOps op, unsigned short predicate, Value *LHS, Value *RHS, const std::string &Name, BasicBlock *InsertAtEnd) - : Instruction(Type::Int1Ty, op, + : Instruction(ty, op, OperandTraits<CmpInst>::op_begin(this), OperandTraits<CmpInst>::operands(this), InsertAtEnd) { |
