RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-01-24 13:15:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix this regression and remove the XFAIL from this test.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18674 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alkis Evlogimenos 2004-12-08 23:10:30 +00:00
parent 8690180f49
commit 54a96a2ad6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -4216,9 +4216,11 @@ bool InstCombiner::runOnFunction(Function &F) {
// Instruction isn't dead, see if we can constant propagate it...
if (Constant *C = ConstantFoldInstruction(I)) {
Value* Ptr = I->getOperand(0);
if (isa<GetElementPtrInst>(I) &&
cast<Constant>(I->getOperand(0))->isNullValue() &&
!isa<ConstantPointerNull>(C)) {
cast<Constant>(Ptr)->isNullValue() &&
!isa<ConstantPointerNull>(C) &&
cast<PointerType>(Ptr->getType())->getElementType()->isSized()) {
// If this is a constant expr gep that is effectively computing an
// "offsetof", fold it into 'cast int X to T*' instead of 'gep 0, 0, 12'
bool isFoldableGEP = true;
@ -4226,7 +4228,7 @@ bool InstCombiner::runOnFunction(Function &F) {
if (!isa<ConstantInt>(I->getOperand(i)))
isFoldableGEP = false;
if (isFoldableGEP) {
uint64_t Offset = TD->getIndexedOffset(I->getOperand(0)->getType(),
uint64_t Offset = TD->getIndexedOffset(Ptr->getType(),
std::vector<Value*>(I->op_begin()+1, I->op_end()));
C = ConstantUInt::get(Type::ULongTy, Offset);
C = ConstantExpr::getCast(C, TD->getIntPtrType());

1
test/Transforms/InstCombine/2004-12-08-InstCombineCrash.ll
View File

@ -1,5 +1,4 @@
; RUN: llvm-as %s -o - | opt -instcombine
; XFAIL: *
%struct.llvm_java_object_base = type opaque
"java/lang/Object" = type { %struct.llvm_java_object_base }