From: George Burgess IV <george.burgess.iv@gmail.com>
Date: Tue, 2 Feb 2016 23:15:26 +0000 (+0000)
Subject: Attempt to fix builds broken by r259595.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5a229f779d6db330fd8edb1b839c9eb50a606fe;p=platform%2Fupstream%2Fllvm.git

Attempt to fix builds broken by r259595.

llvm-svn: 259599
---

diff --git a/llvm/include/llvm/Transforms/Utils/MemorySSA.h b/llvm/include/llvm/Transforms/Utils/MemorySSA.h
index 893908c..b87640c 100644
--- a/llvm/include/llvm/Transforms/Utils/MemorySSA.h
+++ b/llvm/include/llvm/Transforms/Utils/MemorySSA.h
@@ -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;
diff --git a/llvm/lib/Transforms/Utils/MemorySSA.cpp b/llvm/lib/Transforms/Utils/MemorySSA.cpp
index 0ef4688..6022206 100644
--- a/llvm/lib/Transforms/Utils/MemorySSA.cpp
+++ b/llvm/lib/Transforms/Utils/MemorySSA.cpp
@@ -379,7 +379,7 @@ bool MemorySSA::dominatesUse(const MemoryAccess *Replacer,
   // 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;
   }