add support for calloc to objectsize lowering
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@156102 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/InstCombine/InstCombineCalls.cpp b/lib/Transforms/InstCombine/InstCombineCalls.cpp
index 5be7997..4196ca6 100644
--- a/lib/Transforms/InstCombine/InstCombineCalls.cpp
+++ b/lib/Transforms/InstCombine/InstCombineCalls.cpp
@@ -300,11 +300,23 @@
}
} else if (CallInst *MI = extractMallocCall(Op1)) {
// Get allocation size.
- Type* MallocType = getMallocAllocatedType(MI);
- if (MallocType && MallocType->isSized())
- if (Value *NElems = getMallocArraySize(MI, TD, true))
- if (ConstantInt *NElements = dyn_cast<ConstantInt>(NElems))
- Size = NElements->getZExtValue() * TD->getTypeAllocSize(MallocType);
+ Value *Arg = MI->getArgOperand(0);
+ if (ConstantInt *CI = dyn_cast<ConstantInt>(Arg))
+ Size = CI->getZExtValue();
+
+ } else if (CallInst *MI = extractCallocCall(Op1)) {
+ // Get allocation size.
+ Value *Arg1 = MI->getArgOperand(0);
+ Value *Arg2 = MI->getArgOperand(1);
+ if (ConstantInt *CI1 = dyn_cast<ConstantInt>(Arg1))
+ if (ConstantInt *CI2 = dyn_cast<ConstantInt>(Arg2)) {
+ bool overflow;
+ APInt SizeAP = CI1->getValue().umul_ov(CI2->getValue(), overflow);
+ if (!overflow)
+ Size = SizeAP.getZExtValue();
+ else
+ return ReplaceInstUsesWith(CI, ConstantInt::get(ReturnTy, DontKnow));
+ }
}
// Do not return "I don't know" here. Later optimization passes could