[PATCH] D34660: [CFLAA] Move a common function to the utils header to reduce duplication

[Davide Italiano via Phabricator via llvm-commits]

davide created this revision.
Herald added a subscriber: david2050.

In the same vein as my last change. I'm not convinced about using `inline` in the header to force the function to live in a COMDAT, so, suggestions welcome.


https://reviews.llvm.org/D34660

Files:
  include/llvm/Analysis/CFLAliasAnalysisUtils.h
  lib/Analysis/CFLAndersAliasAnalysis.cpp
  lib/Analysis/CFLSteensAliasAnalysis.cpp


Index: lib/Analysis/CFLSteensAliasAnalysis.cpp
===================================================================
--- lib/Analysis/CFLSteensAliasAnalysis.cpp
+++ lib/Analysis/CFLSteensAliasAnalysis.cpp
@@ -90,17 +90,6 @@
 /// Determines whether it would be pointless to add the given Value to our sets.
 static bool canSkipAddingToSets(Value *Val);
 
-static Function *parentFunctionOfValue(Value *Val) {
-  if (auto *Inst = dyn_cast<Instruction>(Val)) {
-    auto *Bb = Inst->getParent();
-    return Bb->getParent();
-  }
-
-  if (auto *Arg = dyn_cast<Argument>(Val))
-    return Arg->getParent();
-  return nullptr;
-}
-
 static bool canSkipAddingToSets(Value *Val) {
   // Constants can share instances, which may falsely unify multiple
   // sets, e.g. in
@@ -281,8 +270,8 @@
     return NoAlias;
 
   Function *Fn = nullptr;
-  Function *MaybeFnA = parentFunctionOfValue(ValA);
-  Function *MaybeFnB = parentFunctionOfValue(ValB);
+  Function *MaybeFnA = const_cast<Function *>(parentFunctionOfValue(ValA));
+  Function *MaybeFnB = const_cast<Function *>(parentFunctionOfValue(ValB));
   if (!MaybeFnA && !MaybeFnB) {
     // The only times this is known to happen are when globals + InlineAsm are
     // involved
Index: lib/Analysis/CFLAndersAliasAnalysis.cpp
===================================================================
--- lib/Analysis/CFLAndersAliasAnalysis.cpp
+++ lib/Analysis/CFLAndersAliasAnalysis.cpp
@@ -68,17 +68,6 @@
     : AAResultBase(std::move(RHS)), TLI(RHS.TLI) {}
 CFLAndersAAResult::~CFLAndersAAResult() {}
 
-static const Function *parentFunctionOfValue(const Value *Val) {
-  if (auto *Inst = dyn_cast<Instruction>(Val)) {
-    auto *Bb = Inst->getParent();
-    return Bb->getParent();
-  }
-
-  if (auto *Arg = dyn_cast<Argument>(Val))
-    return Arg->getParent();
-  return nullptr;
-}
-
 namespace {
 
 enum class MatchState : uint8_t {
Index: include/llvm/Analysis/CFLAliasAnalysisUtils.h
===================================================================
--- include/llvm/Analysis/CFLAliasAnalysisUtils.h
+++ include/llvm/Analysis/CFLAliasAnalysisUtils.h
@@ -41,4 +41,19 @@
   }
 };
 
+namespace llvm {
+namespace cflaa {
+inline const Function *parentFunctionOfValue(const Value *Val) {
+  if (auto *Inst = dyn_cast<Instruction>(Val)) {
+    auto *Bb = Inst->getParent();
+    return Bb->getParent();
+  }
+
+  if (auto *Arg = dyn_cast<Argument>(Val))
+    return Arg->getParent();
+  return nullptr;
+}
+}
+}
+
 #endif // LLVM_ANALYSIS_CFLALIASANALYSISUTILS_H


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D34660.104061.patch
Type: text/x-patch
Size: 2506 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170627/794ccb9c/attachment.bin>