[llvm] r259599 - Attempt to fix builds broken by r259595.

George Burgess IV via llvm-commits llvm-commits at lists.llvm.org
Tue Feb 2 15:15:26 PST 2016


Author: gbiv
Date: Tue Feb  2 17:15:26 2016
New Revision: 259599

URL: http://llvm.org/viewvc/llvm-project?rev=259599&view=rev
Log:
Attempt to fix builds broken by r259595.


Modified:
    llvm/trunk/include/llvm/Transforms/Utils/MemorySSA.h
    llvm/trunk/lib/Transforms/Utils/MemorySSA.cpp

Modified: llvm/trunk/include/llvm/Transforms/Utils/MemorySSA.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Utils/MemorySSA.h?rev=259599&r1=259598&r2=259599&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/Utils/MemorySSA.h (original)
+++ llvm/trunk/include/llvm/Transforms/Utils/MemorySSA.h Tue Feb  2 17:15:26 2016
@@ -840,7 +840,7 @@ public:
     return DefIterator == Other.DefIterator;
   }
 
-  typename BaseT::iterator::reference operator*() const {
+  BaseT::iterator::reference operator*() const {
     assert(DefIterator != OriginalAccess->defs_end() &&
            "Tried to access past the end of our iterator");
     return CurrentPair;

Modified: llvm/trunk/lib/Transforms/Utils/MemorySSA.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/MemorySSA.cpp?rev=259599&r1=259598&r2=259599&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/MemorySSA.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/MemorySSA.cpp Tue Feb  2 17:15:26 2016
@@ -379,7 +379,7 @@ bool MemorySSA::dominatesUse(const Memor
   // Since we may occur multiple times in the phi node, we have to check each
   // operand to ensure Replacer dominates each operand where Replacee occurs.
   for (const Use &Arg : MP->operands()) {
-    if (Arg != Replacee &&
+    if (Arg.get() != Replacee &&
         !DT->dominates(Replacer->getBlock(), MP->getIncomingBlock(Arg)))
       return false;
   }




More information about the llvm-commits mailing list