Backout merge, a=backout
authorDavid Mandelin <dmandelin@mozilla.com>
Wed, 29 Dec 2010 17:47:55 -0800
changeset 59732 37068ce988b98c3fbe7196c7e887cc8e21835852
parent 59730 2571397d53be3baa5a2d4b03390d05358bc2b84e (current diff)
parent 59731 ed90ba2b89454305ed8099f9a4220dfe9f99396e (diff)
child 59733 c9682df3daf8f31c3f0d1f8fb4a525d8af9de30b
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersbackout
milestone2.0b9pre
Backout merge, a=backout
js/src/jsscope.h
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -824,24 +824,16 @@ extern JS_FRIEND_DATA(JSScopeStats) js_s
 
 # define METER(x)       JS_ATOMIC_INCREMENT(&js_scope_stats.x)
 #else
 # define METER(x)       /* nothing */
 #endif
 
 namespace js {
 
-inline static volatile int *vcopy(volatile int *dst, int *src, size_t bytes)
-{
-    int *end = src + bytes / sizeof(int);
-    for (; src < end; ++src, ++dst)
-        *dst = *src;
-    return dst;
-}
-
 JS_ALWAYS_INLINE js::Shape **
 Shape::search(js::Shape **startp, jsid id, bool adding)
 {
     METER(searches);
     if (!(*startp)->table) {
         /*
          * Not enough properties to justify hashing: search from *startp.
          *
@@ -855,23 +847,16 @@ Shape::search(js::Shape **startp, jsid i
             if (shape->id == id) {
                 METER(hits);
                 return spp;
             }
         }
         METER(misses);
         return spp;
     }
-    {
-        char blackbox[sizeof(Shape) + 8];
-        volatile int *p = (int *) blackbox;
-        *p++ = 0xfcfcfcfc;
-        p = vcopy(p, (int *) *startp, sizeof(Shape));
-        *p = 0xfdfdfdfd;
-    }
     return (*startp)->table->search(id, adding);
 }
 
 #undef METER
 
 inline bool
 Shape::isSharedPermanent() const
 {