Kill the warnings. KILL THEM WITH FIRE. No bug, r=sparky
authorJeff Walden <jwalden@mit.edu>
Tue, 06 Dec 2011 11:58:37 -0500
changeset 83811 e37f232c2e6d6f65ffabd41bc1ffe9b1c5b82dce
parent 83810 70ca58127396844824186b0b3468d467072a2b51
child 83812 d4ac6e1958e872b555387b80f64b75eb5a330bd9
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssparky
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Kill the warnings. KILL THEM WITH FIRE. No bug, r=sparky
js/src/jsgcmark.cpp
js/src/jstypedarray.cpp
js/src/methodjit/FastOps.cpp
--- a/js/src/jsgcmark.cpp
+++ b/js/src/jsgcmark.cpp
@@ -694,26 +694,16 @@ static void
 PrintPropertyGetterOrSetter(JSTracer *trc, char *buf, size_t bufsize)
 {
     JS_ASSERT(trc->debugPrinter == PrintPropertyGetterOrSetter);
     Shape *shape = (Shape *)trc->debugPrintArg;
     PrintPropertyId(buf, bufsize, shape->propid(),
                     trc->debugPrintIndex ? js_setter_str : js_getter_str); 
 }
 
-#ifdef DEBUG
-static void
-PrintPropertyMethod(JSTracer *trc, char *buf, size_t bufsize)
-{
-    JS_ASSERT(trc->debugPrinter == PrintPropertyMethod);
-    Shape *shape = (Shape *)trc->debugPrintArg;
-    PrintPropertyId(buf, bufsize, shape->propid(), " method");
-}
-#endif /* DEBUG */
-
 static inline void
 ScanValue(GCMarker *gcmarker, const Value &v)
 {
     if (v.isMarkable()) {
         JSGCTraceKind kind = v.gcKind();
         if (kind == JSTRACE_STRING) {
             PushMarkStack(gcmarker, v.toString());
         } else {
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -220,17 +220,17 @@ ArrayBuffer::create(JSContext *cx, int32
     }
 
     JS_ASSERT(obj->getClass() == &ArrayBuffer::slowClass);
 
     js::Shape *empty = EmptyShape::getInitialShape(cx, &ArrayBufferClass,
                                                    obj->getProto(), obj->getParent(),
                                                    gc::FINALIZE_OBJECT16);
     if (!empty)
-        return false;
+        return NULL;
     obj->setLastPropertyInfallible(empty);
 
     /*
      * The first 8 bytes hold the length.
      * The rest of it is a flat data store for the array buffer.
      */
     if (!obj->allocateArrayBufferSlots(cx, nbytes))
         return NULL;
@@ -1379,17 +1379,17 @@ class TypedArrayTemplate
 
         JS_ASSERT(obj->getClass() == slowClass());
 
         js::Shape *empty = EmptyShape::getInitialShape(cx, fastClass(),
                                                        obj->getProto(), obj->getParent(),
                                                        gc::FINALIZE_OBJECT8,
                                                        BaseShape::NOT_EXTENSIBLE);
         if (!empty)
-            return false;
+            return NULL;
         obj->setLastPropertyInfallible(empty);
 
         JS_ASSERT(obj->numFixedSlots() == NUM_FIXED_SLOTS);
 
         return obj;
     }
 
     /*
--- a/js/src/methodjit/FastOps.cpp
+++ b/js/src/methodjit/FastOps.cpp
@@ -1490,17 +1490,17 @@ mjit::Compiler::tryConvertInteger(FrameE
 /* Get the common shape used by all dense arrays with a prototype at globalObj. */
 static inline Shape *
 GetDenseArrayShape(JSContext *cx, JSObject *globalObj)
 {
     JS_ASSERT(globalObj);
 
     JSObject *proto;
     if (!js_GetClassPrototype(cx, globalObj, JSProto_Array, &proto, NULL))
-        return false;
+        return NULL;
 
     return EmptyShape::getInitialShape(cx, &ArrayClass, proto,
                                        proto->getParent(), gc::FINALIZE_OBJECT0);
 }
 
 bool
 mjit::Compiler::jsop_setelem(bool popGuaranteed)
 {