<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Apr 13, 2015 at 4:20 PM, Daniel Berlin <span dir="ltr"><<a href="mailto:dberlin@dberlin.org" target="_blank">dberlin@dberlin.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dannyb<br>
Date: Mon Apr 13 18:20:13 2015<br>
New Revision: 234813<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=234813&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=234813&view=rev</a><br>
Log:<br>
Common some code from MemoryDependenceAnalysis that will be used in MemorySSA<br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/Analysis/AliasAnalysis.h<br>
    llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/Analysis/AliasAnalysis.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/AliasAnalysis.h?rev=234813&r1=234812&r2=234813&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/AliasAnalysis.h?rev=234813&r1=234812&r2=234813&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Analysis/AliasAnalysis.h (original)<br>
+++ llvm/trunk/include/llvm/Analysis/AliasAnalysis.h Mon Apr 13 18:20:13 2015<br>
@@ -145,6 +145,19 @@ public:<br>
   Location getLocation(const AtomicRMWInst *RMWI);<br>
   static Location getLocationForSource(const MemTransferInst *MTI);<br>
   static Location getLocationForDest(const MemIntrinsic *MI);<br>
+  Location getLocation(const Instruction *Inst) {<br>
+    if (auto *I = dyn_cast<LoadInst>(Inst))<br>
+      return getLocation(I);<br>
+    else if (auto *I = dyn_cast<StoreInst>(Inst))<br></blockquote><div><br>Drop the elses after returns?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+      return getLocation(I);<br>
+    else if (auto *I = dyn_cast<VAArgInst>(Inst))<br>
+      return getLocation(I);<br>
+    else if (auto *I = dyn_cast<AtomicCmpXchgInst>(Inst))<br>
+      return getLocation(I);<br>
+    else if (auto *I = dyn_cast<AtomicRMWInst>(Inst))<br>
+      return getLocation(I);<br>
+    llvm_unreachable("unsupported memory instruction");<br></blockquote><div><br>& that last one can just be "return getLocation(cast<...>(Inst))" (branching to unreachable is generally avoided in favor of an assertion - but we do sometimes make tradeoffs for consistency in cases like this)<br><br>& sometimes code like this is phrased using a switch over the instruction kind enum instead, for speed & such.<br><br>- David<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+  }<br>
<br>
   /// Alias analysis result - Either we know for sure that it does not alias, we<br>
   /// know for sure it must alias, or we don't know anything: The two pointers<br>
<br>
Modified: llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp?rev=234813&r1=234812&r2=234813&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp?rev=234813&r1=234812&r2=234813&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp (original)<br>
+++ llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp Mon Apr 13 18:20:13 2015<br>
@@ -874,23 +874,7 @@ MemoryDependenceAnalysis::getNonLocalCal<br>
 void MemoryDependenceAnalysis::<br>
 getNonLocalPointerDependency(Instruction *QueryInst,<br>
                              SmallVectorImpl<NonLocalDepResult> &Result) {<br>
-<br>
-  auto getLocation = [](AliasAnalysis *AA, Instruction *Inst) {<br>
-    if (auto *I = dyn_cast<LoadInst>(Inst))<br>
-      return AA->getLocation(I);<br>
-    else if (auto *I = dyn_cast<StoreInst>(Inst))<br>
-      return AA->getLocation(I);<br>
-    else if (auto *I = dyn_cast<VAArgInst>(Inst))<br>
-      return AA->getLocation(I);<br>
-    else if (auto *I = dyn_cast<AtomicCmpXchgInst>(Inst))<br>
-      return AA->getLocation(I);<br>
-    else if (auto *I = dyn_cast<AtomicRMWInst>(Inst))<br>
-      return AA->getLocation(I);<br>
-    else<br>
-      llvm_unreachable("unsupported memory instruction");<br>
-  };<br>
-<br>
-  const AliasAnalysis::Location Loc = getLocation(AA, QueryInst);<br>
+  const AliasAnalysis::Location Loc = AA->getLocation(QueryInst);<br>
   bool isLoad = isa<LoadInst>(QueryInst);<br>
   BasicBlock *FromBB = QueryInst->getParent();<br>
   assert(FromBB);<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>