From 6a9ab1077e460fc3a5288237c1580ed61849057a Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 13 Oct 2010 16:49:53 -0700
Subject: [PATCH] Bug 603825 - Fix a bunch of warnings.  r=jwalden.

---
 js/src/jsinterp.cpp           | 3 +--
 js/src/jsinterp.h             | 2 +-
 js/src/jsinterpinlines.h      | 3 ++-
 js/src/methodjit/Compiler.cpp | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 6105de381916..23280911d768 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -448,7 +448,7 @@ ComputeGlobalThis(JSContext *cx, Value *argv)
 
 namespace js {
 
-bool
+void
 ReportIncompatibleMethod(JSContext *cx, Value *vp, Class *clasp)
 {
     Value &thisv = vp[1];
@@ -486,7 +486,6 @@ ReportIncompatibleMethod(JSContext *cx, Value *vp, Class *clasp)
                              clasp->name, JS_GetFunctionName(fun),
                              name);
     }
-    return false;
 }
 
 bool
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index 0edead61202c..8625d96076ec 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -805,7 +805,7 @@ namespace js {
  * Report an error that the this value passed as |this| in the given arguments
  * vector is not compatible with the specified class.
  */
-bool
+void
 ReportIncompatibleMethod(JSContext *cx, Value *vp, Class *clasp);
 
 /*
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index 013509a3f93f..6040ea635651 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -633,7 +633,8 @@ GetPrimitiveThis(JSContext *cx, Value *vp, T *v)
         return true;
     }
 
-    return ReportIncompatibleMethod(cx, vp, Behavior::getClass());
+    ReportIncompatibleMethod(cx, vp, Behavior::getClass());
+    return false;
 }
 
 /*
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index aa97628b2c2f..35fe192c1d17 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -2822,7 +2822,9 @@ mjit::Compiler::jsop_callprop_str(JSAtom *atom)
     frame.shift(-1);
 
     /* 4) Test if the function can take a primitive. */
+#ifdef DEBUG
     FrameEntry *funFe = frame.peek(-2);
+#endif
     JS_ASSERT(!funFe->isTypeKnown());
 
     /*