commit a8d4713798086ceffeb406392ddaad2faaf2aca5
author Jim Stichnoth <stichnot@chromium.org> Tue Sep 08 14:43:38 2015 -0700
committer Jim Stichnoth <stichnot@chromium.org> Tue Sep 08 14:43:38 2015 -0700
tree 4819ef7d935f2ee5ef752f94fcd23ca28c6e307d
parent 5300bfe5c1b6dd711f77284691c920fc6c830873

Fix warnings produced by g++ on Windows.

Scraped non-pragma related warnings from a recent trybot run:

wget -O - 'http://build.chromium.org/p/tryserver.nacl/builders/nacl-toolchain-win7-pnacl-x86_64/builds/3221/steps/llvm_i686_w64_mingw32%20%28build%29/logs/stdio' | grep subzero | grep warning | grep -v pragma

BUG= none
R=ascull@google.com, jpp@chromium.org

Review URL: https://codereview.chromium.org/1315193020.

src/IceAssemblerX86Base.h

diff --git a/src/IceAssemblerX86Base.h b/src/IceAssemblerX86Base.h
index ba80fd8..3ff4642 100644
--- a/src/IceAssemblerX86Base.h
+++ b/src/IceAssemblerX86Base.h
@@ -954,7 +954,7 @@
 
     return IsGPR && (Reg & 0x04) != 0 && (Reg & 0x08) == 0 &&
            isByteSizedType(Ty);
-  };
+  }
 
   // assembleAndEmitRex is used for determining which (if any) rex prefix should
   // be emitted for the current instruction. It allows different types for Reg
@@ -970,10 +970,13 @@
                           ? T::Operand::RexW
                           : T::Operand::RexNone;
     const uint8_t R = (Reg & 0x08) ? T::Operand::RexR : T::Operand::RexNone;
-    const uint8_t X = (Addr != nullptr) ? Addr->rexX() : T::Operand::RexNone;
+    const uint8_t X = (Addr != nullptr)
+                          ? (typename T::Operand::RexBits)Addr->rexX()
+                          : T::Operand::RexNone;
     const uint8_t B =
-        (Addr != nullptr) ? Addr->rexB() : (Rm & 0x08) ? T::Operand::RexB
-                                                       : T::Operand::RexNone;
+        (Addr != nullptr)
+            ? (typename T::Operand::RexBits)Addr->rexB()
+            : (Rm & 0x08) ? T::Operand::RexB : T::Operand::RexNone;
     const uint8_t Prefix = W | R | X | B;
     if (Prefix != T::Operand::RexNone) {
       emitUint8(Prefix);

src/IceCfgNode.cpp

diff --git a/src/IceCfgNode.cpp b/src/IceCfgNode.cpp
index 095994e..d57224b 100644
--- a/src/IceCfgNode.cpp
+++ b/src/IceCfgNode.cpp
@@ -241,6 +241,7 @@
     }
   }
   assert(Found);
+  (void)Found;
   // Repoint this node's in-edge.
   Found = false;
   for (CfgNode *&I : InEdges) {
@@ -252,12 +253,14 @@
     }
   }
   assert(Found);
+  (void)Found;
   // Repoint all suitable branch instructions' target and return.
   Found = false;
   for (Inst &I : Pred->getInsts())
     if (!I.isDeleted() && I.repointEdges(this, NewNode))
       Found = true;
   assert(Found);
+  (void)Found;
   return NewNode;
 }
 

src/IceInstX8632.cpp

diff --git a/src/IceInstX8632.cpp b/src/IceInstX8632.cpp
index 3a56e1b..cfd7fb3 100644
--- a/src/IceInstX8632.cpp
+++ b/src/IceInstX8632.cpp
@@ -280,4 +280,4 @@
 } // namespace X86Internal
 } // end of namespace Ice
 
-X86INSTS_DEFINE_STATIC_DATA(TargetX8632);
+X86INSTS_DEFINE_STATIC_DATA(TargetX8632)

src/IceInstX8664.cpp

diff --git a/src/IceInstX8664.cpp b/src/IceInstX8664.cpp
index 49dc9d8..6d9ccd6 100644
--- a/src/IceInstX8664.cpp
+++ b/src/IceInstX8664.cpp
@@ -254,4 +254,4 @@
 } // namespace X86Internal
 } // end of namespace Ice
 
-X86INSTS_DEFINE_STATIC_DATA(TargetX8664);
+X86INSTS_DEFINE_STATIC_DATA(TargetX8664)

src/IceTargetLoweringARM32.cpp

diff --git a/src/IceTargetLoweringARM32.cpp b/src/IceTargetLoweringARM32.cpp
index 2be2497..423572c 100644
--- a/src/IceTargetLoweringARM32.cpp
+++ b/src/IceTargetLoweringARM32.cpp
@@ -2259,7 +2259,7 @@
 }
 
 void TargetARM32::lowerIntrinsicCall(const InstIntrinsicCall *Instr) {
-  switch (Intrinsics::IntrinsicID ID = Instr->getIntrinsicInfo().ID) {
+  switch (Instr->getIntrinsicInfo().ID) {
   case Intrinsics::AtomicCmpxchg: {
     UnimplementedError(Func->getContext()->getFlags());
     return;

src/IceTargetLoweringMIPS32.cpp

diff --git a/src/IceTargetLoweringMIPS32.cpp b/src/IceTargetLoweringMIPS32.cpp
index 00a294a..080e56b 100644
--- a/src/IceTargetLoweringMIPS32.cpp
+++ b/src/IceTargetLoweringMIPS32.cpp
@@ -474,7 +474,7 @@
 }
 
 void TargetMIPS32::lowerIntrinsicCall(const InstIntrinsicCall *Instr) {
-  switch (Intrinsics::IntrinsicID ID = Instr->getIntrinsicInfo().ID) {
+  switch (Instr->getIntrinsicInfo().ID) {
   case Intrinsics::AtomicCmpxchg: {
     UnimplementedError(Func->getContext()->getFlags());
     return;