From d0dc48e79fd764ae798a518fe44b4bba5ee15f91 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Wed, 29 Aug 2012 15:37:22 -0700
Subject: [PATCH] Fix Windows VC9 debug compiler warnings.  No bug, r=themaid,
 r=terrence

--HG--
extra : rebase_source : 173f849857d3350be3f0a4f39bce4444369b9b82
---
 js/src/jsopcode.cpp | 4 ++--
 js/src/jsscript.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 415a71b1dd29..13ef72790092 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -5968,7 +5968,7 @@ ExpressionDecompiler::decompilePC(jsbytecode *pc)
         else
             return write("[") &&
                    quote(prop, '\'') &&
-                   write("]") >= 0;
+                   write("]");
         return true;
       }
       case JSOP_GETELEM:
@@ -6024,7 +6024,7 @@ ExpressionDecompiler::decompilePC(jsbytecode *pc)
         return write(js_this_str);
       case JSOP_CALL:
       case JSOP_FUNCALL:
-        return decompilePC(pcstack[-(GET_ARGC(pc) + 2)]) &&
+        return decompilePC(pcstack[-int32_t(GET_ARGC(pc) + 2)]) &&
                write("(...)");
       default:
         break;
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index a46b5fc885ea..2b8596ac1533 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -178,7 +178,7 @@ XDRScriptBindings(XDRState<mode> *xdr, LifoAllocScope &las, unsigned numArgs, un
         }
 
         for (BindingIter bi(script->bindings); bi; bi++) {
-            uint8_t u8 = (uint8_t(bi->kind()) << 1) | bi->aliased();
+            uint8_t u8 = (uint8_t(bi->kind()) << 1) | uint8_t(bi->aliased());
             if (!xdr->codeUint8(&u8))
                 return false;
         }