[llvm-branch-commits] [llvm-branch] r85976 - in /llvm/branches/Apple/Leela/lib: Analysis/AliasSetTracker.cpp Analysis/CaptureTracking.cpp Analysis/MemoryBuiltins.cpp Transforms/Utils/Local.cpp VMCore/Instruction.cpp
Bill Wendling
isanbard at gmail.com
Tue Nov 3 15:47:35 PST 2009
Author: void
Date: Tue Nov 3 17:47:34 2009
New Revision: 85976
URL: http://llvm.org/viewvc/llvm-project?rev=85976&view=rev
Log:
$ svn merge -c 85781 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85781 into '.':
U lib/Analysis/MemoryBuiltins.cpp
$ svn merge -c 85814 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85814 into '.':
G lib/Analysis/MemoryBuiltins.cpp
$ svn merge -c 85863 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85863 into '.':
U lib/Transforms/Utils/Local.cpp
$ svn merge -c 85865 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85865 into '.':
U lib/Analysis/CaptureTracking.cpp
$ svn merge -c 85866 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85866 into '.':
U lib/Analysis/AliasSetTracker.cpp
$ svn merge -c 85933 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85933 into '.':
G lib/Analysis/MemoryBuiltins.cpp
$ svn merge -c 85936 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85936 into '.':
G lib/Analysis/MemoryBuiltins.cpp
U lib/VMCore/Instruction.cpp
Modified:
llvm/branches/Apple/Leela/lib/Analysis/AliasSetTracker.cpp
llvm/branches/Apple/Leela/lib/Analysis/CaptureTracking.cpp
llvm/branches/Apple/Leela/lib/Analysis/MemoryBuiltins.cpp
llvm/branches/Apple/Leela/lib/Transforms/Utils/Local.cpp
llvm/branches/Apple/Leela/lib/VMCore/Instruction.cpp
Modified: llvm/branches/Apple/Leela/lib/Analysis/AliasSetTracker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Analysis/AliasSetTracker.cpp?rev=85976&r1=85975&r2=85976&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/lib/Analysis/AliasSetTracker.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Analysis/AliasSetTracker.cpp Tue Nov 3 17:47:34 2009
@@ -13,7 +13,6 @@
#include "llvm/Analysis/AliasSetTracker.h"
#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/MemoryBuiltins.h"
#include "llvm/Instructions.h"
#include "llvm/IntrinsicInst.h"
#include "llvm/Pass.h"
@@ -305,13 +304,6 @@
bool AliasSetTracker::add(CallSite CS) {
- Instruction* Inst = CS.getInstruction();
- if (isFreeCall(Inst)) {
- bool NewPtr;
- addPointer(Inst->getOperand(1), ~0, AliasSet::Mods, NewPtr);
- return NewPtr;
- }
-
if (isa<DbgInfoIntrinsic>(CS.getInstruction()))
return true; // Ignore DbgInfo Intrinsics.
if (AA.doesNotAccessMemory(CS))
@@ -435,14 +427,6 @@
}
bool AliasSetTracker::remove(CallSite CS) {
- Instruction* Inst = CS.getInstruction();
- if (isFreeCall(Inst)) {
- AliasSet *AS = findAliasSetForPointer(Inst->getOperand(1), ~0);
- if (!AS) return false;
- remove(*AS);
- return true;
- }
-
if (AA.doesNotAccessMemory(CS))
return false; // doesn't alias anything
Modified: llvm/branches/Apple/Leela/lib/Analysis/CaptureTracking.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Analysis/CaptureTracking.cpp?rev=85976&r1=85975&r2=85976&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/lib/Analysis/CaptureTracking.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Analysis/CaptureTracking.cpp Tue Nov 3 17:47:34 2009
@@ -17,7 +17,6 @@
//===----------------------------------------------------------------------===//
#include "llvm/Analysis/CaptureTracking.h"
-#include "llvm/Analysis/MemoryBuiltins.h"
#include "llvm/Instructions.h"
#include "llvm/Value.h"
#include "llvm/ADT/SmallSet.h"
@@ -49,9 +48,6 @@
switch (I->getOpcode()) {
case Instruction::Call:
- if (isFreeCall(I))
- // Freeing a pointer does not cause it to be captured.
- break;
case Instruction::Invoke: {
CallSite CS = CallSite::get(I);
// Not captured if the callee is readonly, doesn't return a copy through
Modified: llvm/branches/Apple/Leela/lib/Analysis/MemoryBuiltins.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Analysis/MemoryBuiltins.cpp?rev=85976&r1=85975&r2=85976&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/lib/Analysis/MemoryBuiltins.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Analysis/MemoryBuiltins.cpp Tue Nov 3 17:47:34 2009
@@ -16,7 +16,6 @@
#include "llvm/Constants.h"
#include "llvm/Instructions.h"
#include "llvm/Module.h"
-#include "llvm/ADT/APInt.h"
#include "llvm/Analysis/ConstantFolding.h"
using namespace llvm;
@@ -26,7 +25,7 @@
/// isMalloc - Returns true if the the value is either a malloc call or a
/// bitcast of the result of a malloc call.
-bool llvm::isMalloc(const Value* I) {
+bool llvm::isMalloc(const Value *I) {
return extractMallocCall(I) || extractMallocCallFromBitCast(I);
}
@@ -34,16 +33,14 @@
if (!CI)
return false;
- const Module* M = CI->getParent()->getParent()->getParent();
- Function *MallocFunc = M->getFunction("malloc");
-
- if (CI->getOperand(0) != MallocFunc)
+ Function *Callee = CI->getCalledFunction();
+ if (Callee == 0 || !Callee->isDeclaration() || Callee->getName() != "malloc")
return false;
// Check malloc prototype.
// FIXME: workaround for PR5130, this will be obsolete when a nobuiltin
// attribute will exist.
- const FunctionType *FTy = MallocFunc->getFunctionType();
+ const FunctionType *FTy = Callee->getFunctionType();
if (FTy->getNumParams() != 1)
return false;
if (IntegerType *ITy = dyn_cast<IntegerType>(FTy->param_begin()->get())) {
@@ -58,17 +55,17 @@
/// extractMallocCall - Returns the corresponding CallInst if the instruction
/// is a malloc call. Since CallInst::CreateMalloc() only creates calls, we
/// ignore InvokeInst here.
-const CallInst* llvm::extractMallocCall(const Value* I) {
+const CallInst *llvm::extractMallocCall(const Value *I) {
const CallInst *CI = dyn_cast<CallInst>(I);
return (isMallocCall(CI)) ? CI : NULL;
}
-CallInst* llvm::extractMallocCall(Value* I) {
+CallInst *llvm::extractMallocCall(Value *I) {
CallInst *CI = dyn_cast<CallInst>(I);
return (isMallocCall(CI)) ? CI : NULL;
}
-static bool isBitCastOfMallocCall(const BitCastInst* BCI) {
+static bool isBitCastOfMallocCall(const BitCastInst *BCI) {
if (!BCI)
return false;
@@ -77,13 +74,13 @@
/// extractMallocCallFromBitCast - Returns the corresponding CallInst if the
/// instruction is a bitcast of the result of a malloc call.
-CallInst* llvm::extractMallocCallFromBitCast(Value* I) {
+CallInst *llvm::extractMallocCallFromBitCast(Value *I) {
BitCastInst *BCI = dyn_cast<BitCastInst>(I);
return (isBitCastOfMallocCall(BCI)) ? cast<CallInst>(BCI->getOperand(0))
: NULL;
}
-const CallInst* llvm::extractMallocCallFromBitCast(const Value* I) {
+const CallInst *llvm::extractMallocCallFromBitCast(const Value *I) {
const BitCastInst *BCI = dyn_cast<BitCastInst>(I);
return (isBitCastOfMallocCall(BCI)) ? cast<CallInst>(BCI->getOperand(0))
: NULL;
@@ -94,21 +91,21 @@
return isa<ConstantInt>(val) && cast<ConstantInt>(val)->isOne();
}
-static Value* isArrayMallocHelper(const CallInst *CI, LLVMContext &Context,
- const TargetData* TD) {
+static Value *isArrayMallocHelper(const CallInst *CI, LLVMContext &Context,
+ const TargetData *TD) {
if (!CI)
return NULL;
// Type must be known to determine array size.
- const Type* T = getMallocAllocatedType(CI);
+ const Type *T = getMallocAllocatedType(CI);
if (!T)
return NULL;
- Value* MallocArg = CI->getOperand(1);
- ConstantExpr* CO = dyn_cast<ConstantExpr>(MallocArg);
- BinaryOperator* BO = dyn_cast<BinaryOperator>(MallocArg);
+ Value *MallocArg = CI->getOperand(1);
+ ConstantExpr *CO = dyn_cast<ConstantExpr>(MallocArg);
+ BinaryOperator *BO = dyn_cast<BinaryOperator>(MallocArg);
- Constant* ElementSize = ConstantExpr::getSizeOf(T);
+ Constant *ElementSize = ConstantExpr::getSizeOf(T);
ElementSize = ConstantExpr::getTruncOrBitCast(ElementSize,
MallocArg->getType());
Constant *FoldedElementSize =
@@ -128,8 +125,8 @@
if (!CO && !BO)
return NULL;
- Value* Op0 = NULL;
- Value* Op1 = NULL;
+ Value *Op0 = NULL;
+ Value *Op1 = NULL;
unsigned Opcode = 0;
if (CO && ((CO->getOpcode() == Instruction::Mul) ||
(CO->getOpcode() == Instruction::Shl))) {
@@ -157,17 +154,13 @@
return Op1;
}
if (Opcode == Instruction::Shl) {
- ConstantInt* Op1CI = dyn_cast<ConstantInt>(Op1);
+ ConstantInt *Op1CI = dyn_cast<ConstantInt>(Op1);
if (!Op1CI) return NULL;
APInt Op1Int = Op1CI->getValue();
- unsigned Op1Width = Op1Int.getBitWidth();
- // check for overflow
- if (Op1Int.getActiveBits() > 64 || Op1Int.getZExtValue() > Op1Width)
- return NULL;
- Value* Op1Pow = ConstantInt::get(Context,
- APInt(Op1Width, 0).set(Op1Int.getZExtValue()));
-
+ uint64_t BitToSet = Op1Int.getLimitedValue(Op1Int.getBitWidth() - 1);
+ Value *Op1Pow = ConstantInt::get(Context,
+ APInt(Op1Int.getBitWidth(), 0).set(BitToSet));
if (Op0 == ElementSize || (FoldedElementSize && Op0 == FoldedElementSize))
// ArraySize << log2(ElementSize)
return Op1Pow;
@@ -185,10 +178,10 @@
/// isArrayMalloc - Returns the corresponding CallInst if the instruction
/// is a call to malloc whose array size can be determined and the array size
/// is not constant 1. Otherwise, return NULL.
-CallInst* llvm::isArrayMalloc(Value* I, LLVMContext &Context,
- const TargetData* TD) {
+CallInst *llvm::isArrayMalloc(Value *I, LLVMContext &Context,
+ const TargetData *TD) {
CallInst *CI = extractMallocCall(I);
- Value* ArraySize = isArrayMallocHelper(CI, Context, TD);
+ Value *ArraySize = isArrayMallocHelper(CI, Context, TD);
if (ArraySize &&
ArraySize != ConstantInt::get(CI->getOperand(1)->getType(), 1))
@@ -198,10 +191,10 @@
return NULL;
}
-const CallInst* llvm::isArrayMalloc(const Value* I, LLVMContext &Context,
- const TargetData* TD) {
+const CallInst *llvm::isArrayMalloc(const Value *I, LLVMContext &Context,
+ const TargetData *TD) {
const CallInst *CI = extractMallocCall(I);
- Value* ArraySize = isArrayMallocHelper(CI, Context, TD);
+ Value *ArraySize = isArrayMallocHelper(CI, Context, TD);
if (ArraySize &&
ArraySize != ConstantInt::get(CI->getOperand(1)->getType(), 1))
@@ -214,10 +207,10 @@
/// getMallocType - Returns the PointerType resulting from the malloc call.
/// This PointerType is the result type of the call's only bitcast use.
/// If there is no unique bitcast use, then return NULL.
-const PointerType* llvm::getMallocType(const CallInst* CI) {
+const PointerType *llvm::getMallocType(const CallInst *CI) {
assert(isMalloc(CI) && "GetMallocType and not malloc call");
- const BitCastInst* BCI = NULL;
+ const BitCastInst *BCI = NULL;
// Determine if CallInst has a bitcast use.
for (Value::use_const_iterator UI = CI->use_begin(), E = CI->use_end();
@@ -241,8 +234,8 @@
/// getMallocAllocatedType - Returns the Type allocated by malloc call. This
/// Type is the result type of the call's only bitcast use. If there is no
/// unique bitcast use, then return NULL.
-const Type* llvm::getMallocAllocatedType(const CallInst* CI) {
- const PointerType* PT = getMallocType(CI);
+const Type *llvm::getMallocAllocatedType(const CallInst *CI) {
+ const PointerType *PT = getMallocType(CI);
return PT ? PT->getElementType() : NULL;
}
@@ -251,8 +244,8 @@
/// then return that multiple. For non-array mallocs, the multiple is
/// constant 1. Otherwise, return NULL for mallocs whose array size cannot be
/// determined.
-Value* llvm::getMallocArraySize(CallInst* CI, LLVMContext &Context,
- const TargetData* TD) {
+Value *llvm::getMallocArraySize(CallInst *CI, LLVMContext &Context,
+ const TargetData *TD) {
return isArrayMallocHelper(CI, Context, TD);
}
@@ -261,26 +254,23 @@
//
/// isFreeCall - Returns true if the the value is a call to the builtin free()
-bool llvm::isFreeCall(const Value* I) {
+bool llvm::isFreeCall(const Value *I) {
const CallInst *CI = dyn_cast<CallInst>(I);
if (!CI)
return false;
-
- const Module* M = CI->getParent()->getParent()->getParent();
- Function *FreeFunc = M->getFunction("free");
-
- if (CI->getOperand(0) != FreeFunc)
+ Function *Callee = CI->getCalledFunction();
+ if (Callee == 0 || !Callee->isDeclaration() || Callee->getName() != "free")
return false;
// Check free prototype.
// FIXME: workaround for PR5130, this will be obsolete when a nobuiltin
// attribute will exist.
- const FunctionType *FTy = FreeFunc->getFunctionType();
- if (FTy->getReturnType() != Type::getVoidTy(M->getContext()))
+ const FunctionType *FTy = Callee->getFunctionType();
+ if (!FTy->getReturnType()->isVoidTy())
return false;
if (FTy->getNumParams() != 1)
return false;
- if (FTy->param_begin()->get() != Type::getInt8PtrTy(M->getContext()))
+ if (FTy->param_begin()->get() != Type::getInt8PtrTy(Callee->getContext()))
return false;
return true;
Modified: llvm/branches/Apple/Leela/lib/Transforms/Utils/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Transforms/Utils/Local.cpp?rev=85976&r1=85975&r2=85976&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/lib/Transforms/Utils/Local.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Transforms/Utils/Local.cpp Tue Nov 3 17:47:34 2009
@@ -24,7 +24,6 @@
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/Analysis/ConstantFolding.h"
#include "llvm/Analysis/DebugInfo.h"
-#include "llvm/Analysis/MemoryBuiltins.h"
#include "llvm/Analysis/ProfileInfo.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
@@ -60,8 +59,8 @@
// If we see a free or a call which may write to memory (i.e. which might do
// a free) the pointer could be marked invalid.
- if (isFreeCall(BBI) || (isa<CallInst>(BBI) && BBI->mayWriteToMemory() &&
- !isa<DbgInfoIntrinsic>(BBI)))
+ if (isa<CallInst>(BBI) && BBI->mayWriteToMemory() &&
+ !isa<DbgInfoIntrinsic>(BBI))
return false;
if (LoadInst *LI = dyn_cast<LoadInst>(BBI)) {
Modified: llvm/branches/Apple/Leela/lib/VMCore/Instruction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/VMCore/Instruction.cpp?rev=85976&r1=85975&r2=85976&view=diff
==============================================================================
--- llvm/branches/Apple/Leela/lib/VMCore/Instruction.cpp (original)
+++ llvm/branches/Apple/Leela/lib/VMCore/Instruction.cpp Tue Nov 3 17:47:34 2009
@@ -303,32 +303,6 @@
return false;
}
-// Code here matches isFreeCall from MemoryBuiltins, which is not in VMCore.
-static bool isFreeCall(const Value* I) {
- const CallInst *CI = dyn_cast<CallInst>(I);
- if (!CI)
- return false;
-
- const Module* M = CI->getParent()->getParent()->getParent();
- Function *FreeFunc = M->getFunction("free");
-
- if (CI->getOperand(0) != FreeFunc)
- return false;
-
- // Check free prototype.
- // FIXME: workaround for PR5130, this will be obsolete when a nobuiltin
- // attribute will exist.
- const FunctionType *FTy = FreeFunc->getFunctionType();
- if (FTy->getReturnType() != Type::getVoidTy(M->getContext()))
- return false;
- if (FTy->getNumParams() != 1)
- return false;
- if (FTy->param_begin()->get() != Type::getInt8PtrTy(M->getContext()))
- return false;
-
- return true;
-}
-
/// mayReadFromMemory - Return true if this instruction may read memory.
///
bool Instruction::mayReadFromMemory() const {
@@ -338,8 +312,6 @@
case Instruction::Load:
return true;
case Instruction::Call:
- if (isFreeCall(this))
- return true;
return !cast<CallInst>(this)->doesNotAccessMemory();
case Instruction::Invoke:
return !cast<InvokeInst>(this)->doesNotAccessMemory();
@@ -357,8 +329,6 @@
case Instruction::VAArg:
return true;
case Instruction::Call:
- if (isFreeCall(this))
- return true;
return !cast<CallInst>(this)->onlyReadsMemory();
case Instruction::Invoke:
return !cast<InvokeInst>(this)->onlyReadsMemory();
@@ -418,18 +388,16 @@
CI = dyn_cast<CallInst>(BCI->getOperand(0));
}
- if (!CI) return false;
-
- const Module* M = CI->getParent()->getParent()->getParent();
- Constant *MallocFunc = M->getFunction("malloc");
-
- if (CI->getOperand(0) != MallocFunc)
+ if (!CI)
+ return false;
+ Function *Callee = CI->getCalledFunction();
+ if (Callee == 0 || !Callee->isDeclaration() || Callee->getName() != "malloc")
return false;
// Check malloc prototype.
// FIXME: workaround for PR5130, this will be obsolete when a nobuiltin
// attribute will exist.
- const FunctionType *FTy = cast<Function>(MallocFunc)->getFunctionType();
+ const FunctionType *FTy = Callee->getFunctionType();
if (FTy->getNumParams() != 1)
return false;
if (IntegerType *ITy = dyn_cast<IntegerType>(FTy->param_begin()->get())) {
More information about the llvm-branch-commits
mailing list