From 85c005af0d63c484114ce88258aecb8e1c8c2fa2 Mon Sep 17 00:00:00 2001 From: Torok Edwin Date: Mon, 5 Oct 2009 21:15:43 +0000 Subject: [PATCH] Don't treat malloc calls with non-matching prototype as malloc. Fixes second part of PR5130, miscompilation in FreeBSD kernel, where malloc takes 3 params, and *does* initialize memory. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@83324 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/MallocHelper.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/Analysis/MallocHelper.cpp b/lib/Analysis/MallocHelper.cpp index ab6239e55ad..1a8665b6f6f 100644 --- a/lib/Analysis/MallocHelper.cpp +++ b/lib/Analysis/MallocHelper.cpp @@ -34,12 +34,23 @@ static bool isMallocCall(const CallInst *CI) { return false; const Module* M = CI->getParent()->getParent()->getParent(); - Constant *MallocFunc = M->getFunction("malloc"); + Function *MallocFunc = M->getFunction("malloc"); if (CI->getOperand(0) != MallocFunc) return false; - return true; + // Check malloc prototype. + // FIXME: this will be obsolete when nobuiltin attribute will exist. + const FunctionType *FTy = MallocFunc->getFunctionType(); + if (FTy->getNumParams() != 1) + return false; + if (IntegerType *ITy = dyn_cast(FTy->param_begin()->get())) { + if (ITy->getBitWidth() != 32 && ITy->getBitWidth() != 64) + return false; + return true; + } + + return false; } /// extractMallocCall - Returns the corresponding CallInst if the instruction