From 70bb40bd17f97fd4c394fe218cb2be0425e8f198 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <kparzysz@codeaurora.org>
Date: Tue, 7 Jul 2015 16:02:11 +0000
Subject: [PATCH] [Hexagon] Fix unused variable warnings in NDEBUG build caused
 by r241595

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241600 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/Hexagon/BitTracker.cpp        | 11 +++++------
 lib/Target/Hexagon/HexagonBitTracker.cpp |  9 +++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/Target/Hexagon/BitTracker.cpp b/lib/Target/Hexagon/BitTracker.cpp
index 3b79e6234d2..1d1996d6b1c 100644
--- a/lib/Target/Hexagon/BitTracker.cpp
+++ b/lib/Target/Hexagon/BitTracker.cpp
@@ -527,8 +527,7 @@ BT::RegisterCell BT::MachineEvaluator::eMLU(const RegisterCell &A1,
 
 BT::RegisterCell BT::MachineEvaluator::eASL(const RegisterCell &A1,
       uint16_t Sh) const {
-  uint16_t W = A1.width();
-  assert(Sh <= W);
+  assert(Sh <= A1.width());
   RegisterCell Res = RegisterCell::ref(A1);
   Res.rol(Sh);
   Res.fill(0, Sh, BitValue::Zero);
@@ -644,8 +643,7 @@ BT::RegisterCell BT::MachineEvaluator::eNOT(const RegisterCell &A1) const {
 
 BT::RegisterCell BT::MachineEvaluator::eSET(const RegisterCell &A1,
       uint16_t BitN) const {
-  uint16_t W = A1.width();
-  assert(BitN < W);
+  assert(BitN < A1.width());
   RegisterCell Res = RegisterCell::ref(A1);
   Res[BitN] = BitValue::One;
   return Res;
@@ -654,8 +652,7 @@ BT::RegisterCell BT::MachineEvaluator::eSET(const RegisterCell &A1,
 
 BT::RegisterCell BT::MachineEvaluator::eCLR(const RegisterCell &A1,
       uint16_t BitN) const {
-  uint16_t W = A1.width();
-  assert(BitN < W);
+  assert(BitN < A1.width());
   RegisterCell Res = RegisterCell::ref(A1);
   Res[BitN] = BitValue::Zero;
   return Res;
@@ -722,6 +719,7 @@ BT::RegisterCell BT::MachineEvaluator::eXTR(const RegisterCell &A1,
 BT::RegisterCell BT::MachineEvaluator::eINS(const RegisterCell &A1,
       const RegisterCell &A2, uint16_t AtN) const {
   uint16_t W1 = A1.width(), W2 = A2.width();
+  (void)W1;
   assert(AtN < W1 && AtN+W2 <= W1);
   // Copy bits from A1, insert A2 at position AtN.
   RegisterCell Res = RegisterCell::ref(A1);
@@ -1017,6 +1015,7 @@ void BT::subst(RegisterRef OldRR, RegisterRef NewRR) {
   BitMask NM = ME.mask(NewRR.Reg, NewRR.Sub);
   uint16_t OMB = OM.first(), OME = OM.last();
   uint16_t NMB = NM.first(), NME = NM.last();
+  (void)NME;
   assert((OME-OMB == NME-NMB) &&
          "Substituting registers of different lengths");
   for (CellMapType::iterator I = Map.begin(), E = Map.end(); I != E; ++I) {
diff --git a/lib/Target/Hexagon/HexagonBitTracker.cpp b/lib/Target/Hexagon/HexagonBitTracker.cpp
index b4e4f9b5b92..8e4baf1d706 100644
--- a/lib/Target/Hexagon/HexagonBitTracker.cpp
+++ b/lib/Target/Hexagon/HexagonBitTracker.cpp
@@ -195,15 +195,13 @@ bool HexagonEvaluator::evaluate(const MachineInstr *MI,
       return eIMM(Op.getImm(), W);
     if (!Op.isReg())
       return RegisterCell::self(0, W);
-    uint16_t w = getRegBitWidth(Reg[N]);
-    assert(w == W && "Register width mismatch");
+    assert(getRegBitWidth(Reg[N]) == W && "Register width mismatch");
     return rc(N);
   };
   // Extract RW low bits of the cell.
   auto lo = [this] (const BT::RegisterCell &RC, uint16_t RW)
         -> BT::RegisterCell {
-    uint16_t W = RC.width();
-    assert(RW <= W);
+    assert(RW <= RC.width());
     return eXTR(RC, 0, RW);
   };
   // Extract RW high bits of the cell.
@@ -216,8 +214,7 @@ bool HexagonEvaluator::evaluate(const MachineInstr *MI,
   // Extract N-th halfword (counting from the least significant position).
   auto half = [this] (const BT::RegisterCell &RC, unsigned N)
         -> BT::RegisterCell {
-    uint16_t W = RC.width();
-    assert(N*16+16 <= W);
+    assert(N*16+16 <= RC.width());
     return eXTR(RC, N*16, N*16+16);
   };
   // Shuffle bits (pick even/odd from cells and merge into result).
-- 
2.34.1