From 60adac46f2932abec4683b869182e64f5500e6bb Mon Sep 17 00:00:00 2001
From: George Burgess IV <george.burgess.iv@gmail.com>
Date: Tue, 2 Feb 2016 23:26:01 +0000
Subject: [PATCH] Attempt #2 to unbreak r259595.

llvm-svn: 259602
---
 llvm/lib/Transforms/Utils/MemorySSA.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/llvm/lib/Transforms/Utils/MemorySSA.cpp b/llvm/lib/Transforms/Utils/MemorySSA.cpp
index 6022206..382a18b 100644
--- a/llvm/lib/Transforms/Utils/MemorySSA.cpp
+++ b/llvm/lib/Transforms/Utils/MemorySSA.cpp
@@ -416,6 +416,7 @@ void MemorySSA::verifyDomination(Function &F) {
         } else {
           UseBlock = cast<MemoryAccess>(U)->getBlock();
         }
+        (void)UseBlock;
         assert(DT->dominates(MP->getBlock(), UseBlock) &&
                "Memory PHI does not dominate it's uses");
       }
@@ -587,10 +588,9 @@ void MemorySSAPrinterPass::getAnalysisUsage(AnalysisUsage &AU) const {
 }
 
 bool MemorySSAPrinterPass::doInitialization(Module &M) {
-  VerifyMemorySSA =
-      M.getContext()
-          .template getOption<bool, MemorySSAPrinterPass,
-                              &MemorySSAPrinterPass::VerifyMemorySSA>();
+  VerifyMemorySSA = M.getContext()
+                        .getOption<bool, MemorySSAPrinterPass,
+                                   &MemorySSAPrinterPass::VerifyMemorySSA>();
   return false;
 }
 
-- 
2.7.4