6502/llvm-6502
1
0 Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-27 04:18:42 +00:00
Code Issues Projects Releases Wiki Activity

Approved by Chris:

Browse Source 
$ svn merge -c 113109 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113109 into '.':
U    test/Transforms/GlobalOpt/crash.ll
U    lib/Analysis/ValueTracking.cpp

Log:
fix PR8063, a crash in globalopt in the malloc analysis code.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_28@113111 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling committed 2010-09-05 17:45:44 +00:00
1 parent ba8c43afdd
commit 390f711778
2 files changed
+44 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/Analysis/ValueTracking.cpp
+29 -20
View File
@@ -880,19 +880,20 @@ bool llvm::ComputeMultiple(Value *V, unsigned Base, Value *&Multiple,
} }
Value *Mul0 = NULL; Value *Mul0 = NULL;
Value *Mul1 = NULL; if (ComputeMultiple(Op0, Base, Mul0, LookThroughSExt, Depth+1)) {
bool M0 = ComputeMultiple(Op0, Base, Mul0, if (Constant *Op1C = dyn_cast<Constant>(Op1))
LookThroughSExt, Depth+1); if (Constant *MulC = dyn_cast<Constant>(Mul0)) {
bool M1 = ComputeMultiple(Op1, Base, Mul1, if (Op1C->getType()->getPrimitiveSizeInBits() <
LookThroughSExt, Depth+1); MulC->getType()->getPrimitiveSizeInBits())
Op1C = ConstantExpr::getZExt(Op1C, MulC->getType());
if (M0) { if (Op1C->getType()->getPrimitiveSizeInBits() >
if (isa<Constant>(Op1) && isa<Constant>(Mul0)) { MulC->getType()->getPrimitiveSizeInBits())
// V == Base * (Mul0 * Op1), so return (Mul0 * Op1) MulC = ConstantExpr::getZExt(MulC, Op1C->getType());
Multiple = ConstantExpr::getMul(cast<Constant>(Mul0),
cast<Constant>(Op1)); // V == Base * (Mul0 * Op1), so return (Mul0 * Op1)
return true; Multiple = ConstantExpr::getMul(MulC, Op1C);
} return true;
}
if (ConstantInt *Mul0CI = dyn_cast<ConstantInt>(Mul0)) if (ConstantInt *Mul0CI = dyn_cast<ConstantInt>(Mul0))
if (Mul0CI->getValue() == 1) { if (Mul0CI->getValue() == 1) {
@@ -902,13 +903,21 @@ bool llvm::ComputeMultiple(Value *V, unsigned Base, Value *&Multiple,
} }
} }
if (M1) { Value *Mul1 = NULL;
if (isa<Constant>(Op0) && isa<Constant>(Mul1)) { if (ComputeMultiple(Op1, Base, Mul1, LookThroughSExt, Depth+1)) {
// V == Base * (Mul1 * Op0), so return (Mul1 * Op0) if (Constant *Op0C = dyn_cast<Constant>(Op0))
Multiple = ConstantExpr::getMul(cast<Constant>(Mul1), if (Constant *MulC = dyn_cast<Constant>(Mul1)) {
cast<Constant>(Op0)); if (Op0C->getType()->getPrimitiveSizeInBits() <
return true; MulC->getType()->getPrimitiveSizeInBits())
} Op0C = ConstantExpr::getZExt(Op0C, MulC->getType());
if (Op0C->getType()->getPrimitiveSizeInBits() >
MulC->getType()->getPrimitiveSizeInBits())
MulC = ConstantExpr::getZExt(MulC, Op0C->getType());
// V == Base * (Mul1 * Op0), so return (Mul1 * Op0)
Multiple = ConstantExpr::getMul(MulC, Op0C);
return true;
}
if (ConstantInt *Mul1CI = dyn_cast<ConstantInt>(Mul1)) if (ConstantInt *Mul1CI = dyn_cast<ConstantInt>(Mul1))
if (Mul1CI->getValue() == 1) { if (Mul1CI->getValue() == 1) {
test/Transforms/GlobalOpt/crash.ll
+15
View File
@@ -40,3 +40,18 @@ xx:
} }
declare noalias i8* @malloc(i64) nounwind declare noalias i8* @malloc(i64) nounwind
; PR8063
@permute_bitrev.bitrev = internal global i32* null, align 8
define void @permute_bitrev() nounwind {
entry:
%tmp = load i32** @permute_bitrev.bitrev, align 8
%conv = sext i32 0 to i64
%mul = mul i64 %conv, 4
%call = call i8* @malloc(i64 %mul)
%0 = bitcast i8* %call to i32*
store i32* %0, i32** @permute_bitrev.bitrev, align 8
ret void
}