Backout merge, a=backout beta8+ diagnostic
authorDavid Mandelin <dmandelin@mozilla.com>
Mon, 15 Nov 2010 13:06:06 -0800
changeset 57525 feb768bc0cb9a816bebe7be8e36e38a19bb62bae
parent 57523 491b922beb057f21fc8aaf50a57d2cd78d14fd5c (current diff)
parent 57524 4dff0cc28f4849bf62b0bdde85396b1aadec9dcb (diff)
child 57526 1950375b2ec2dc553db3a7c3225dbfdcc5d7bc69
push id16965
push userdmandelin@mozilla.com
push dateMon, 15 Nov 2010 21:06:08 +0000
treeherdermozilla-central@feb768bc0cb9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
milestone2.0b8pre
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
Backout merge, a=backout beta8+ diagnostic
js/src/jsapi.h
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -321,22 +321,16 @@ JSID_IS_STRING(jsid id)
 
 static JS_ALWAYS_INLINE JSString *
 JSID_TO_STRING(jsid id)
 {
     JS_ASSERT(JSID_IS_STRING(id));
     return (JSString *)(JSID_BITS(id));
 }
 
-static JS_ALWAYS_INLINE JSBool
-JSID_IS_ZERO(jsid id)
-{
-    return JSID_BITS(id) == 0;
-}
-
 JS_PUBLIC_API(JSBool)
 JS_StringHasBeenInterned(JSString *str);
 
 /* A jsid may only hold an interned JSString. */
 static JS_ALWAYS_INLINE jsid
 INTERNED_STRING_TO_JSID(JSString *str)
 {
     jsid id;
--- a/js/src/jsscopeinlines.h
+++ b/js/src/jsscopeinlines.h
@@ -168,20 +168,16 @@ namespace js {
 
 inline
 Shape::Shape(jsid id, js::PropertyOp getter, js::PropertyOp setter, uint32 slot, uintN attrs,
              uintN flags, intN shortid, uint32 shape, uint32 slotSpan)
   : JSObjectMap(shape, slotSpan),
     table(NULL), id(id), rawGetter(getter), rawSetter(setter), slot(slot), attrs(uint8(attrs)),
     flags(uint8(flags)), shortid(int16(shortid)), parent(NULL)
 {
-#define JS_CRASH(addr) *(int *) addr = 0
-    if (JSID_IS_ZERO(id))
-        JS_CRASH(0xa8);
-#undef JS_CRASH
     JS_ASSERT_IF(slotSpan != SHAPE_INVALID_SLOT, slotSpan < JSObject::NSLOTS_LIMIT);
     JS_ASSERT_IF(getter && (attrs & JSPROP_GETTER), getterObj->isCallable());
     JS_ASSERT_IF(setter && (attrs & JSPROP_SETTER), setterObj->isCallable());
     kids.setNull();
 }
 
 inline
 Shape::Shape(JSContext *cx, Class *aclasp)