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

[Attributor][FIX] Use pointer not reference as it can be null

This commit is contained in:
Johannes Doerfert 2020-02-15 20:38:49 -06:00
parent 62654cab7e
commit 1d5da8cd30
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/Transforms/IPO/Attributor.h
View File

@ -2699,7 +2699,7 @@ struct AAMemoryLocation
/// underlying accessed memory pointer) and it will return true if \p Pred
/// holds every time.
virtual bool checkForAllAccessesToMemoryKind(
const function_ref<bool(const Instruction &, const Value *, AccessKind,
const function_ref<bool(const Instruction *, const Value *, AccessKind,
MemoryLocationsKind)> &Pred,
MemoryLocationsKind MLK) const = 0;

13
llvm/lib/Transforms/IPO/Attributor.cpp
View File

@ -6203,7 +6203,7 @@ struct AAMemoryLocationImpl : public AAMemoryLocation {
/// See AAMemoryLocation::checkForAllAccessesToMemoryKind(...).
bool checkForAllAccessesToMemoryKind(
const function_ref<bool(const Instruction &, const Value *, AccessKind,
const function_ref<bool(const Instruction *, const Value *, AccessKind,
MemoryLocationsKind)> &Pred,
MemoryLocationsKind RequestedMLK) const override {
if (!isValidState())
@ -6218,9 +6218,10 @@ struct AAMemoryLocationImpl : public AAMemoryLocation {
continue;
const auto &Accesses = AccessKindAccessesMap.lookup(CurMLK);
for (const AccessInfo &AI : Accesses)
if (!Pred(*AI.I, AI.Ptr, AI.Kind, CurMLK))
for (const AccessInfo &AI : Accesses) {
if (!Pred(AI.I, AI.Ptr, AI.Kind, CurMLK))
return false;
}
}
return true;
@ -6432,7 +6433,7 @@ AAMemoryLocationImpl::categorizeAccessedLocations(Attributor &A, Instruction &I,
// Now handle global memory if it might be accessed.
bool HasGlobalAccesses = !(ICSAssumedNotAccessedLocs & NO_GLOBAL_MEM);
if (HasGlobalAccesses) {
auto AccessPred = [&](const Instruction &, const Value *Ptr,
auto AccessPred = [&](const Instruction *, const Value *Ptr,
AccessKind Kind, MemoryLocationsKind MLK) {
updateStateAndAccessesMap(AccessedLocs, AccessKindAccessesMap, MLK, &I,
Ptr, Changed);
@ -6566,9 +6567,9 @@ struct AAMemoryLocationCallSite final : AAMemoryLocationImpl {
const IRPosition &FnPos = IRPosition::function(*F);
auto &FnAA = A.getAAFor<AAMemoryLocation>(*this, FnPos);
bool Changed = false;
auto AccessPred = [&](const Instruction &I, const Value *Ptr,
auto AccessPred = [&](const Instruction *I, const Value *Ptr,
AccessKind Kind, MemoryLocationsKind MLK) {
updateStateAndAccessesMap(getState(), AccessKindAccessesMap, MLK, &I, Ptr,
updateStateAndAccessesMap(getState(), AccessKindAccessesMap, MLK, I, Ptr,
Changed);
return true;
};