Bug 897850 - Fix order of "construct" and "hasInstance" comments. r=evilpie. DONTBUILD
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 25 Jul 2013 15:30:53 -0700
changeset 140043 6089b164088dbb4de39966cf58040f57d3544f00
parent 140042 ad41d146f6573b72f6945aa0e15ad89bc3d9f185
child 140044 277c1e376c3cacb878d29301c992aaf290f3ae6f
push id31578
push usernnethercote@mozilla.com
push dateFri, 26 Jul 2013 00:36:04 +0000
treeherdermozilla-inbound@6089b164088d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersevilpie
bugs897850
milestone25.0a1
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
Bug 897850 - Fix order of "construct" and "hasInstance" comments. r=evilpie. DONTBUILD
js/src/builtin/MapObject.cpp
js/src/jsapi-tests/testCustomIterator.cpp
js/src/jsapi.cpp
js/src/jsarray.cpp
js/src/jsexn.cpp
js/src/jsiter.cpp
js/src/vm/ArgumentsObject.cpp
js/src/vm/Debugger.cpp
js/src/vm/RegExpObject.cpp
js/src/vm/RegExpStatics.cpp
js/src/vm/ScopeObject.cpp
js/src/vm/TypedArrayObject.cpp
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -1013,18 +1013,18 @@ Class MapObject::class_ = {
     JS_PropertyStub,         // getProperty
     JS_StrictPropertyStub,   // setProperty
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     finalize,
     NULL,                    // checkAccess
     NULL,                    // call
+    NULL,                    // hasInstance
     NULL,                    // construct
-    NULL,                    // hasInstance
     mark
 };
 
 const JSPropertySpec MapObject::properties[] = {
     JS_PSG("size", size, 0),
     JS_PS_END
 };
 
@@ -1572,18 +1572,18 @@ Class SetObject::class_ = {
     JS_PropertyStub,         // getProperty
     JS_StrictPropertyStub,   // setProperty
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     finalize,
     NULL,                    // checkAccess
     NULL,                    // call
+    NULL,                    // hasInstance
     NULL,                    // construct
-    NULL,                    // hasInstance
     mark
 };
 
 const JSPropertySpec SetObject::properties[] = {
     JS_PSG("size", size, 0),
     JS_PS_END
 };
 
--- a/js/src/jsapi-tests/testCustomIterator.cpp
+++ b/js/src/jsapi-tests/testCustomIterator.cpp
@@ -36,18 +36,18 @@ js::Class HasCustomIterClass = {
     JS_PropertyStub,
     JS_StrictPropertyStub,
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     NULL,
     NULL, /* checkAccess */
     NULL, /* call */
+    NULL, /* hasInstance */
     NULL, /* construct */
-    NULL, /* hasInstance */
     NULL, /* mark */
     {
         NULL,       /* outerObject */
         NULL,       /* innerObject */
         IterHook,
         false        /* isWrappedNative */
     }
 };
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -4573,18 +4573,18 @@ static Class prop_iter_class = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     prop_iter_finalize,
     NULL,           /* checkAccess */
     NULL,           /* call        */
+    NULL,           /* hasInstance */
     NULL,           /* construct   */
-    NULL,           /* hasInstance */
     prop_iter_trace
 };
 
 JS_PUBLIC_API(JSObject *)
 JS_NewPropertyIterator(JSContext *cx, JSObject *objArg)
 {
     RootedObject obj(cx, objArg);
 
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -762,18 +762,18 @@ Class ArrayObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     NULL,
     NULL,           /* checkAccess */
     NULL,           /* call        */
+    NULL,           /* hasInstance */
     NULL,           /* construct   */
-    NULL,           /* hasInstance */
     NULL,           /* trace       */
     {
         NULL,       /* outerObject */
         NULL,       /* innerObject */
         NULL,       /* iteratorObject  */
         false,      /* isWrappedNative */
     }
 };
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -64,18 +64,18 @@ Class ErrorObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
     (JSResolveOp)exn_resolve,
     JS_ConvertStub,
     exn_finalize,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
+    NULL,                 /* hasInstance */
     NULL,                 /* construct   */
-    NULL,                 /* hasInstance */
     exn_trace
 };
 
 template <typename T>
 struct JSStackTraceElemImpl
 {
     T                   funName;
     const char          *filename;
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -846,18 +846,18 @@ Class PropertyIteratorObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     finalize,
     NULL,                    /* checkAccess */
     NULL,                    /* call        */
+    NULL,                    /* hasInstance */
     NULL,                    /* construct   */
-    NULL,                    /* hasInstance */
     trace,
     {
         NULL,                /* outerObject    */
         NULL,                /* innerObject    */
         iterator_iteratorObject,
     }
 };
 
@@ -1447,18 +1447,18 @@ Class GeneratorObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     generator_finalize,
     NULL,                    /* checkAccess */
     NULL,                    /* call        */
+    NULL,                    /* hasInstance */
     NULL,                    /* construct   */
-    NULL,                    /* hasInstance */
     generator_trace,
     {
         NULL,                /* outerObject    */
         NULL,                /* innerObject    */
         iterator_iteratorObject,
     }
 };
 
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -589,18 +589,18 @@ Class NormalArgumentsObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     args_enumerate,
     reinterpret_cast<JSResolveOp>(args_resolve),
     JS_ConvertStub,
     ArgumentsObject::finalize,
     NULL,                    /* checkAccess */
     NULL,                    /* call        */
+    NULL,                    /* hasInstance */
     NULL,                    /* construct   */
-    NULL,                    /* hasInstance */
     ArgumentsObject::trace,
     {
         NULL,       /* outerObject */
         NULL,       /* innerObject */
         NULL,       /* iteratorObject  */
         false,      /* isWrappedNative */
     }
 };
@@ -620,18 +620,18 @@ Class StrictArgumentsObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     strictargs_enumerate,
     reinterpret_cast<JSResolveOp>(strictargs_resolve),
     JS_ConvertStub,
     ArgumentsObject::finalize,
     NULL,                    /* checkAccess */
     NULL,                    /* call        */
+    NULL,                    /* hasInstance */
     NULL,                    /* construct   */
-    NULL,                    /* hasInstance */
     ArgumentsObject::trace,
     {
         NULL,       /* outerObject */
         NULL,       /* innerObject */
         NULL,       /* iteratorObject  */
         false,      /* isWrappedNative */
     }
 };
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1659,18 +1659,18 @@ Debugger::finalize(FreeOp *fop, JSObject
 Class Debugger::jsclass = {
     "Debugger",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUG_COUNT),
     JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, Debugger::finalize,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
+    NULL,                 /* hasInstance */
     NULL,                 /* construct   */
-    NULL,                 /* hasInstance */
     Debugger::traceObject
 };
 
 Debugger *
 Debugger::fromThisValue(JSContext *cx, const CallArgs &args, const char *fnname)
 {
     if (!args.thisv().isObject()) {
         ReportObjectRequired(cx);
@@ -2697,18 +2697,18 @@ DebuggerScript_trace(JSTracer *trc, JSOb
 Class DebuggerScript_class = {
     "Script",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGSCRIPT_COUNT),
     JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
+    NULL,                 /* hasInstance */
     NULL,                 /* construct   */
-    NULL,                 /* hasInstance */
     DebuggerScript_trace
 };
 
 JSObject *
 Debugger::newDebuggerScript(JSContext *cx, HandleScript script)
 {
     assertSameCompartment(cx, object.get());
 
@@ -3549,18 +3549,18 @@ DebuggerSource_trace(JSTracer *trc, JSOb
 Class DebuggerSource_class = {
     "Source",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGSOURCE_COUNT),
     JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
+    NULL,                 /* hasInstance */
     NULL,                 /* construct   */
-    NULL,                 /* hasInstance */
     DebuggerSource_trace
 };
 
 JSObject *
 Debugger::newDebuggerSource(JSContext *cx, JS::HandleScriptSource source)
 {
     assertSameCompartment(cx, object.get());
 
@@ -4334,18 +4334,18 @@ DebuggerObject_trace(JSTracer *trc, JSOb
 Class DebuggerObject_class = {
     "Object",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGOBJECT_COUNT),
     JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
+    NULL,                 /* hasInstance */
     NULL,                 /* construct   */
-    NULL,                 /* hasInstance */
     DebuggerObject_trace
 };
 
 static JSObject *
 DebuggerObject_checkThis(JSContext *cx, const CallArgs &args, const char *fnname)
 {
     if (!args.thisv().isObject()) {
         ReportObjectRequired(cx);
@@ -5136,18 +5136,18 @@ DebuggerEnv_trace(JSTracer *trc, JSObjec
 Class DebuggerEnv_class = {
     "Environment",
     JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
     JSCLASS_HAS_RESERVED_SLOTS(JSSLOT_DEBUGENV_COUNT),
     JS_PropertyStub, JS_DeletePropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,
     NULL,                 /* checkAccess */
     NULL,                 /* call        */
+    NULL,                 /* hasInstance */
     NULL,                 /* construct   */
-    NULL,                 /* hasInstance */
     DebuggerEnv_trace
 };
 
 static JSObject *
 DebuggerEnv_checkThis(JSContext *cx, const CallArgs &args, const char *fnname)
 {
     if (!args.thisv().isObject()) {
         ReportObjectRequired(cx);
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -218,18 +218,18 @@ Class RegExpObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,        /* enumerate */
     JS_ResolveStub,
     JS_ConvertStub,
     NULL,                    /* finalize */
     NULL,                    /* checkAccess */
     NULL,                    /* call */
+    NULL,                    /* hasInstance */
     NULL,                    /* construct */
-    NULL,                    /* hasInstance */
     regexp_trace
 };
 
 RegExpObject *
 RegExpObject::create(ExclusiveContext *cx, RegExpStatics *res, const jschar *chars, size_t length,
                      RegExpFlag flags, TokenStream *tokenStream)
 {
     RegExpFlag staticsFlags = res->getFlags();
--- a/js/src/vm/RegExpStatics.cpp
+++ b/js/src/vm/RegExpStatics.cpp
@@ -43,18 +43,18 @@ Class RegExpStaticsObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     resc_finalize,
     NULL,                    /* checkAccess */
     NULL,                    /* call        */
+    NULL,                    /* hasInstance */
     NULL,                    /* construct   */
-    NULL,                    /* hasInstance */
     resc_trace
 };
 
 JSObject *
 RegExpStatics::create(JSContext *cx, GlobalObject *parent)
 {
     JSObject *obj = NewObjectWithGivenProto(cx, &RegExpStaticsObject::class_, NULL, parent);
     if (!obj)
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -603,18 +603,18 @@ Class WithObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     NULL,                    /* finalize */
     NULL,                    /* checkAccess */
     NULL,                    /* call        */
+    NULL,                    /* hasInstance */
     NULL,                    /* construct   */
-    NULL,                    /* hasInstance */
     NULL,                    /* trace       */
     JS_NULL_CLASS_EXT,
     {
         with_LookupGeneric,
         with_LookupProperty,
         with_LookupElement,
         with_LookupSpecial,
         NULL,             /* defineGeneric */
--- a/js/src/vm/TypedArrayObject.cpp
+++ b/js/src/vm/TypedArrayObject.cpp
@@ -3450,18 +3450,18 @@ Class ArrayBufferObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     NULL,           /* finalize    */
     NULL,           /* checkAccess */
     NULL,           /* call        */
+    NULL,           /* hasInstance */
     NULL,           /* construct   */
-    NULL,           /* hasInstance */
     ArrayBufferObject::obj_trace,
     JS_NULL_CLASS_EXT,
     {
         ArrayBufferObject::obj_lookupGeneric,
         ArrayBufferObject::obj_lookupProperty,
         ArrayBufferObject::obj_lookupElement,
         ArrayBufferObject::obj_lookupSpecial,
         ArrayBufferObject::obj_defineGeneric,
@@ -3613,18 +3613,18 @@ IMPL_TYPED_ARRAY_COMBINED_UNWRAPPERS(Flo
     JS_PropertyStub,         /* getProperty */                                 \
     JS_StrictPropertyStub,   /* setProperty */                                 \
     JS_EnumerateStub,                                                          \
     JS_ResolveStub,                                                            \
     JS_ConvertStub,                                                            \
     NULL,                    /* finalize */                                    \
     NULL,                    /* checkAccess */                                 \
     NULL,                    /* call        */                                 \
+    NULL,                    /* hasInstance */                                 \
     NULL,                    /* construct   */                                 \
-    NULL,                    /* hasInstance */                                 \
     ArrayBufferViewObject::trace, /* trace  */                                 \
     {                                                                          \
         NULL,       /* outerObject */                                          \
         NULL,       /* innerObject */                                          \
         NULL,       /* iteratorObject  */                                      \
         false,      /* isWrappedNative */                                      \
     },                                                                         \
     {                                                                          \
@@ -3829,18 +3829,18 @@ Class DataViewObject::class_ = {
     JS_PropertyStub,         /* getProperty */
     JS_StrictPropertyStub,   /* setProperty */
     JS_EnumerateStub,
     JS_ResolveStub,
     JS_ConvertStub,
     NULL,                    /* finalize */
     NULL,                    /* checkAccess */
     NULL,                    /* call        */
+    NULL,                    /* hasInstance */
     NULL,                    /* construct   */
-    NULL,                    /* hasInstance */
     ArrayBufferViewObject::trace, /* trace  */
     JS_NULL_CLASS_EXT,
     JS_NULL_OBJECT_OPS
 };
 
 const JSFunctionSpec DataViewObject::jsfuncs[] = {
     JS_FN("getInt8",    DataViewObject::fun_getInt8,      1,0),
     JS_FN("getUint8",   DataViewObject::fun_getUint8,     1,0),