diff options
| author | ed <ed@FreeBSD.org> | 2009-06-03 13:28:00 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2009-06-03 13:28:00 +0000 |
| commit | 036fdcfb2d357cecb320b5a6fd05f4859a63aeba (patch) | |
| tree | 90502b3518861e1704738c228456f7079013368b /lib/Transforms/Scalar/CodeGenPrepare.cpp | |
| parent | 3277b69d734b9c90b44ebde4ede005717e2c3b2e (diff) | |
| download | FreeBSD-src-036fdcfb2d357cecb320b5a6fd05f4859a63aeba.zip FreeBSD-src-036fdcfb2d357cecb320b5a6fd05f4859a63aeba.tar.gz | |
Import LLVM, at r72770.
This should fix LLVM PR4225.
Diffstat (limited to 'lib/Transforms/Scalar/CodeGenPrepare.cpp')
| -rw-r--r-- | lib/Transforms/Scalar/CodeGenPrepare.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/CodeGenPrepare.cpp b/lib/Transforms/Scalar/CodeGenPrepare.cpp index 342b1e5..42978e7 100644 --- a/lib/Transforms/Scalar/CodeGenPrepare.cpp +++ b/lib/Transforms/Scalar/CodeGenPrepare.cpp @@ -624,8 +624,11 @@ bool CodeGenPrepare::OptimizeMemoryInst(Instruction *MemoryInst, Value *Addr, // Add in the base register. if (AddrMode.BaseReg) { Value *V = AddrMode.BaseReg; - if (V->getType() != IntPtrTy) + if (isa<PointerType>(V->getType())) V = new PtrToIntInst(V, IntPtrTy, "sunkaddr", InsertPt); + if (V->getType() != IntPtrTy) + V = CastInst::CreateIntegerCast(V, IntPtrTy, /*isSigned=*/true, + "sunkaddr", InsertPt); if (Result) Result = BinaryOperator::CreateAdd(Result, V, "sunkaddr", InsertPt); else |
