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

[CFLAA] Use raw pointers instead of Optional<Pointer>. NFC. 

Using Optional<> here doesn't seem to be terribly valuable, but
this is not the main point of this change. The change enables
us to merge the (now) two identical copies of parentFunctionOfValue()
that Steensgaard's and Andersens' provide.

llvm-svn: 306351
This commit is contained in:
Davide Italiano 2017-06-27 00:33:37 +00:00
parent 92843707f6
commit 604c003f5f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Analysis/CFLSteensAliasAnalysis.cpp
View File

@ -90,7 +90,7 @@ const StratifiedIndex StratifiedLink::SetSentinel =
/// Determines whether it would be pointless to add the given Value to our sets.
static bool canSkipAddingToSets(Value *Val);
static Optional<Function *> parentFunctionOfValue(Value *Val) {
static Function *parentFunctionOfValue(Value *Val) {
if (auto *Inst = dyn_cast<Instruction>(Val)) {
auto *Bb = Inst->getParent();
return Bb->getParent();
@ -98,7 +98,7 @@ static Optional<Function *> parentFunctionOfValue(Value *Val) {
if (auto *Arg = dyn_cast<Argument>(Val))
return Arg->getParent();
return None;
return nullptr;
}
static bool canSkipAddingToSets(Value *Val) {
@ -281,9 +281,9 @@ AliasResult CFLSteensAAResult::query(const MemoryLocation &LocA,
return NoAlias;
Function *Fn = nullptr;
auto MaybeFnA = parentFunctionOfValue(ValA);
auto MaybeFnB = parentFunctionOfValue(ValB);
if (!MaybeFnA.hasValue() && !MaybeFnB.hasValue()) {
Function *MaybeFnA = parentFunctionOfValue(ValA);
Function *MaybeFnB = parentFunctionOfValue(ValB);
if (!MaybeFnA && !MaybeFnB) {
// The only times this is known to happen are when globals + InlineAsm are
// involved
DEBUG(dbgs()
@ -291,12 +291,12 @@ AliasResult CFLSteensAAResult::query(const MemoryLocation &LocA,
return MayAlias;
}
if (MaybeFnA.hasValue()) {
Fn = *MaybeFnA;
assert((!MaybeFnB.hasValue() || *MaybeFnB == *MaybeFnA) &&
if (MaybeFnA) {
Fn = MaybeFnA;
assert((!MaybeFnB || MaybeFnB == MaybeFnA) &&
"Interprocedural queries not supported");
} else {
Fn = *MaybeFnB;
Fn = MaybeFnB;
}
assert(Fn != nullptr);