Merge.
authorDavid Anderson <danderson@mozilla.com>
Wed, 13 Aug 2008 17:45:50 -0700
changeset 18152 4d81cfd3f6e4bd20bc76626faffd39ff770c629c
parent 18151 97498b23f3602fba6ae4128551ac15835d5aa5a6 (diff)
parent 18149 baac751c4bf54243cdeb047afe121381b9a71a88 (current diff)
child 18153 8c2a3e462e6c807154095fee051f92205e4df931
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1a2pre
Merge.
js/src/jsbuiltins.cpp
js/src/jstracer.cpp
--- a/js/src/jsbuiltins.cpp
+++ b/js/src/jsbuiltins.cpp
@@ -540,17 +540,17 @@ js_Object_p_hasOwnProperty(JSContext* cx
 }
 
 jsint FASTCALL
 js_Object_p_propertyIsEnumerable(JSContext* cx, JSObject* obj, JSString *str)
 {
     jsid id = ATOM_TO_JSID(STRING_TO_JSVAL(str));
     jsval v;
     if (!js_PropertyIsEnumerable(cx, obj, id, &v))
-        return -1;
+        return JSVAL_TO_BOOLEAN(JSVAL_VOID);
     JS_ASSERT(JSVAL_IS_BOOLEAN(v));
     return JSVAL_TO_BOOLEAN(v);
 }
 
 jsdouble FASTCALL
 js_BooleanToNumber(JSContext* cx, jsint unboxed)
 {
     if (unboxed == JSVAL_TO_BOOLEAN(JSVAL_VOID))
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -3499,17 +3499,17 @@ TraceRecorder::record_JSOP_CALL()
         { js_str_replace,              F_String_p_replace_str, "TC", "sr",    FAIL_NULL,   NULL },
         { js_str_replace,              F_String_p_replace_fun, "TC", "fr",    FAIL_NULL,   NULL },
         { js_math_random,              F_Math_random,          "R",    "",    INFALLIBLE,  NULL },
         { js_str_concat,               F_String_p_concat_1int, "TC",  "i",    FAIL_NULL,   NULL },
         { js_array_join,               F_Array_p_join,         "TC",  "s",    FAIL_NULL,   NULL },
         { js_obj_hasOwnProperty,       F_Object_p_hasOwnProperty,
                                                                "TC",  "s",    FAIL_VOID,   NULL },
         { js_obj_propertyIsEnumerable, F_Object_p_propertyIsEnumerable,
-                                                               "TC",  "s",    FAIL_NEG,    NULL },
+                                                               "TC",  "s",    FAIL_VOID,   NULL },
     };
 
     for (uintN i = 0; i < JS_ARRAY_LENGTH(knownNatives); i++) {
         JSTraceableNative* known = &knownNatives[i];
         if ((JSFastNative)fun->u.n.native != known->native)
             continue;
 
         uintN knownargc = strlen(known->argtypes);