Backout merge, a=backout beta8+ diagnostic
authorDavid Mandelin <dmandelin@mozilla.com>
Mon, 15 Nov 2010 13:16:41 -0800
changeset 57528 515b7489c559b2a0ce257145e7ff1d628351aeea
parent 57526 1950375b2ec2dc553db3a7c3225dbfdcc5d7bc69 (current diff)
parent 57527 cbd8dd229b36964163ea4a8e8e804526e2cb2c10 (diff)
child 57529 ac5a1cd933e3337e6b1c91c6c9a95bf4bebd7f16
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersbackout
milestone2.0b8pre
Backout merge, a=backout beta8+ diagnostic
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -3758,26 +3758,19 @@ JSObject::growSlots(JSContext *cx, size_
         JS_ReportOutOfMemory(cx);
         return false;
     }
 
     /* If nothing was allocated yet, treat it as initial allocation. */
     if (!hasSlotsArray())
         return allocSlots(cx, actualCapacity);
 
-    Value *oldslots = slots;
     Value *tmpslots = (Value*) cx->realloc(slots, actualCapacity * sizeof(Value));
     if (!tmpslots)
         return false;    /* Leave dslots as its old size. */
-    // If slots has changed, that means some other thread changed it while we
-    // were realloc'ing, which is very bad.
-#define JS_CRASH(addr) *(int *) addr = 0;
-    if (oldslots != slots)
-        JS_CRASH(0xf0);
-#undef JS_CRASH
     slots = tmpslots;
     capacity = actualCapacity;
 
     /* Initialize the additional slots we added. */
     ClearValueRange(slots + oldcap, actualCapacity - oldcap, isDenseArray());
     return true;
 }