Backout merge. a=betaN+,backout
authorDavid Mandelin <dmandelin@mozilla.com>
Thu, 18 Nov 2010 12:48:59 -0800
changeset 57864 693505bdb668ddf5851f581bda5d49fc6da208a8
parent 57862 62b716f5e267da22e4eff6e25b60786709f037b5 (current diff)
parent 57863 ce22c94f3abae912e19d91bc3754281dfa8441ff (diff)
child 57865 4675bda39bf2e7ab297d9bfb86a7171cb51959c4
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersbetaN
milestone2.0b8pre
Backout merge. a=betaN+,backout
js/src/jsfun.cpp
js/src/methodjit/StubCalls.cpp
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -511,18 +511,16 @@ ArgGetter(JSContext *cx, JSObject *obj, 
     if (JSID_IS_INT(id)) {
         /*
          * arg can exceed the number of arguments if a script changed the
          * prototype to point to another Arguments object with a bigger argc.
          */
         uintN arg = uintN(JSID_TO_INT(id));
         if (arg < obj->getArgsInitialLength()) {
             JS_ASSERT(!obj->getArgsElement(arg).isMagic(JS_ARGS_HOLE));
-            if (obj->getArgsElement(arg).isMagic(JS_ARGS_HOLE))
-                *(int *) 0xe0 = 0;
             if (JSStackFrame *fp = (JSStackFrame *) obj->getPrivate())
                 *vp = fp->canonicalActualArg(arg);
             else
                 *vp = obj->getArgsElement(arg);
         }
     } else if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom)) {
         if (!obj->isArgsLengthOverridden())
             vp->setInt32(obj->getArgsInitialLength());
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -493,18 +493,16 @@ stubs::GetElem(VMFrame &f)
     }
 
     if (!obj->getProperty(cx, id, &rval))
         THROW();
     copyFrom = &rval;
 
   end_getelem:
     f.regs.sp[-2] = *copyFrom;
-    if (regs.sp[-2].isMagic(JS_ARGS_HOLE))
-        *(int *) 0xc0 = 0;
 }
 
 static inline bool
 FetchElementId(VMFrame &f, JSObject *obj, const Value &idval, jsid &id, Value *vp)
 {
     int32_t i_;
     if (ValueFitsInInt32(idval, &i_) && INT_FITS_IN_JSID(i_)) {
         id = INT_TO_JSID(i_);