maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Commit 44487 broke bootstrap of llvm-gcc-4.2. It is 

not yet clear why, but in the meantime work around the
problem by making less use of readnone/readonly info.

llvm-svn: 44626
This commit is contained in:
Duncan Sands 2007-12-05 21:03:28 +00:00
parent 2968476c2d
commit abba5e218c
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Analysis/AliasAnalysis.cpp
View File

@ -116,13 +116,17 @@ AliasAnalysis::getModRefInfo(StoreInst *S, Value *P, unsigned Size) {
AliasAnalysis::ModRefBehavior AliasAnalysis::ModRefBehavior
AliasAnalysis::getModRefBehavior(CallSite CS, AliasAnalysis::getModRefBehavior(CallSite CS,
std::vector<PointerAccessInfo> *Info) { std::vector<PointerAccessInfo> *Info) {
if (CS.doesNotAccessMemory()) if (CS.doesNotAccessMemory() &&
// FIXME: workaround gcc bootstrap breakage
CS.getCalledFunction() && CS.getCalledFunction()->isDeclaration())
// Can't do better than this. // Can't do better than this.
return DoesNotAccessMemory; return DoesNotAccessMemory;
ModRefBehavior MRB = UnknownModRefBehavior; ModRefBehavior MRB = UnknownModRefBehavior;
if (Function *F = CS.getCalledFunction()) if (Function *F = CS.getCalledFunction())
MRB = getModRefBehavior(F, CS, Info); MRB = getModRefBehavior(F, CS, Info);
if (MRB != DoesNotAccessMemory && CS.onlyReadsMemory()) if (MRB != DoesNotAccessMemory && CS.onlyReadsMemory() &&
// FIXME: workaround gcc bootstrap breakage
CS.getCalledFunction() && CS.getCalledFunction()->isDeclaration())
return OnlyReadsMemory; return OnlyReadsMemory;
return MRB; return MRB;
} }
@ -130,11 +134,15 @@ AliasAnalysis::getModRefBehavior(CallSite CS,
AliasAnalysis::ModRefBehavior AliasAnalysis::ModRefBehavior
AliasAnalysis::getModRefBehavior(Function *F, AliasAnalysis::getModRefBehavior(Function *F,
std::vector<PointerAccessInfo> *Info) { std::vector<PointerAccessInfo> *Info) {
if (F->doesNotAccessMemory()) if (F->doesNotAccessMemory() &&
// FIXME: workaround gcc bootstrap breakage
F->isDeclaration())
// Can't do better than this. // Can't do better than this.
return DoesNotAccessMemory; return DoesNotAccessMemory;
ModRefBehavior MRB = getModRefBehavior(F, CallSite(), Info); ModRefBehavior MRB = getModRefBehavior(F, CallSite(), Info);
if (MRB != DoesNotAccessMemory && F->onlyReadsMemory()) if (MRB != DoesNotAccessMemory && F->onlyReadsMemory() &&
// FIXME: workaround gcc bootstrap breakage
F->isDeclaration())
return OnlyReadsMemory; return OnlyReadsMemory;
return MRB; return MRB;
} }

3
llvm/lib/VMCore/Instruction.cpp
View File

@ -13,6 +13,7 @@
#include "llvm/Type.h" #include "llvm/Type.h"
#include "llvm/Instructions.h" #include "llvm/Instructions.h"
#include "llvm/IntrinsicInst.h" // FIXME: remove
#include "llvm/Function.h" #include "llvm/Function.h"
#include "llvm/Support/CallSite.h" #include "llvm/Support/CallSite.h"
#include "llvm/Support/LeakDetector.h" #include "llvm/Support/LeakDetector.h"
@ -208,6 +209,8 @@ bool Instruction::mayWriteToMemory() const {
case Instruction::VAArg: case Instruction::VAArg:
return true; return true;
case Instruction::Call: case Instruction::Call:
if (!isa<IntrinsicInst>(this))
return true; // FIXME: workaround gcc bootstrap breakage
return !cast<CallInst>(this)->onlyReadsMemory(); return !cast<CallInst>(this)->onlyReadsMemory();
case Instruction::Load: case Instruction::Load:
return cast<LoadInst>(this)->isVolatile(); return cast<LoadInst>(this)->isVolatile();