Make FunctionAttrs TBAA-aware.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118417 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/IPO/FunctionAttrs.cpp b/lib/Transforms/IPO/FunctionAttrs.cpp
index be5d827..c4978b4 100644
--- a/lib/Transforms/IPO/FunctionAttrs.cpp
+++ b/lib/Transforms/IPO/FunctionAttrs.cpp
@@ -23,6 +23,7 @@
#include "llvm/CallGraphSCCPass.h"
#include "llvm/GlobalVariable.h"
#include "llvm/IntrinsicInst.h"
+#include "llvm/LLVMContext.h"
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/Analysis/CallGraph.h"
#include "llvm/Analysis/CaptureTracking.h"
@@ -140,10 +141,14 @@
for (CallSite::arg_iterator CI = CS.arg_begin(), CE = CS.arg_end();
CI != CE; ++CI) {
Value *Arg = *CI;
- if (Arg->getType()->isPointerTy() &&
- !AA->pointsToConstantMemory(Arg, /*OrLocal=*/true))
- // Writes memory. Just give up.
- return false;
+ if (Arg->getType()->isPointerTy()) {
+ AliasAnalysis::Location Loc(Arg,
+ AliasAnalysis::UnknownSize,
+ I->getMetadata(LLVMContext::MD_tbaa));
+ if (!AA->pointsToConstantMemory(Arg, /*OrLocal=*/true))
+ // Writes memory. Just give up.
+ return false;
+ }
}
// Only reads and writes local memory.
continue;
@@ -153,16 +158,23 @@
}
} else if (LoadInst *LI = dyn_cast<LoadInst>(I)) {
// Ignore non-volatile loads from local memory.
- if (!LI->isVolatile() &&
- AA->pointsToConstantMemory(LI->getPointerOperand(),
- /*OrLocal=*/true))
- continue;
+ if (!LI->isVolatile()) {
+ AliasAnalysis::Location Loc(LI->getPointerOperand(),
+ AA->getTypeStoreSize(LI->getType()),
+ LI->getMetadata(LLVMContext::MD_tbaa));
+ if (AA->pointsToConstantMemory(Loc, /*OrLocal=*/true))
+ continue;
+ }
} else if (StoreInst *SI = dyn_cast<StoreInst>(I)) {
// Ignore non-volatile stores to local memory.
- if (!SI->isVolatile() &&
- AA->pointsToConstantMemory(SI->getPointerOperand(),
- /*OrLocal=*/true))
- continue;
+ if (!SI->isVolatile()) {
+ const Type *StoredType = SI->getValueOperand()->getType();
+ AliasAnalysis::Location Loc(SI->getPointerOperand(),
+ AA->getTypeStoreSize(StoredType),
+ SI->getMetadata(LLVMContext::MD_tbaa));
+ if (AA->pointsToConstantMemory(Loc, /*OrLocal=*/true))
+ continue;
+ }
}
// Any remaining instructions need to be taken seriously! Check if they