Backed out changeset b8b6fa54fc1a (bug 1079231) for build failures on b2g; r=bustage

--HG--
extra : rebase_source : e7b3f492a815b53699478b08931eadae19a93501

js/src/builtin/MapObject.cpp

@@ -1001,7 +1001,7 @@ bool
 MapIteratorObject::next(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<MapIteratorObject::is, MapIteratorObject::next_impl>(cx, args);
+    return CallNonGenericMethod(cx, is, next_impl, args);
 }
 
 
@@ -1432,7 +1432,7 @@ bool
 MapObject::keys(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<MapObject::is, MapObject::keys_impl>(cx, args);
+    return CallNonGenericMethod(cx, is, keys_impl, args);
 }
 
 bool
@@ -1445,7 +1445,7 @@ bool
 MapObject::values(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<MapObject::is, MapObject::values_impl>(cx, args);
+    return CallNonGenericMethod(cx, is, values_impl, args);
 }
 
 bool
@@ -1458,7 +1458,7 @@ bool
 MapObject::entries(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<MapObject::is, MapObject::entries_impl>(cx, args);
+    return CallNonGenericMethod(cx, is, entries_impl, args);
 }
 
 bool
@@ -1477,7 +1477,7 @@ bool
 MapObject::clear(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<MapObject::is, MapObject::clear_impl>(cx, args);
+    return CallNonGenericMethod(cx, is, clear_impl, args);
 }
 
 JSObject *
@@ -1646,7 +1646,7 @@ bool
 SetIteratorObject::next(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<SetIteratorObject::is, SetIteratorObject::next_impl>(cx, args);
+    return CallNonGenericMethod(cx, is, next_impl, args);
 }
 
 
@@ -1930,7 +1930,7 @@ bool
 SetObject::values(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<SetObject::is, SetObject::values_impl>(cx, args);
+    return CallNonGenericMethod(cx, is, values_impl, args);
 }
 
 bool
@@ -1943,7 +1943,7 @@ bool
 SetObject::entries(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<SetObject::is, SetObject::entries_impl>(cx, args);
+    return CallNonGenericMethod(cx, is, entries_impl, args);
 }
 
 bool
@@ -1962,7 +1962,7 @@ bool
 SetObject::clear(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<SetObject::is, SetObject::clear_impl>(cx, args);
+    return CallNonGenericMethod(cx, is, clear_impl, args);
 }
 
 JSObject *

js/src/builtin/RegExp.cpp

@@ -670,7 +670,7 @@ bool
 js::regexp_exec(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<IsRegExp, regexp_exec_impl>(cx, args);
+    return CallNonGenericMethod(cx, IsRegExp, regexp_exec_impl, args);
 }
 
 /* Separate interface for use by IonMonkey. */
@@ -721,7 +721,7 @@ bool
 js::regexp_test(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<IsRegExp, regexp_test_impl>(cx, args);
+    return CallNonGenericMethod(cx, IsRegExp, regexp_test_impl, args);
 }
 
 bool

js/src/vm/SharedTypedArrayObject.cpp

@@ -339,7 +339,7 @@ class SharedTypedArrayObjectTemplate : public SharedTypedArrayObject
     BufferGetter(JSContext *cx, unsigned argc, Value *vp)
     {
         CallArgs args = CallArgsFromVp(argc, vp);
-        return CallNonGenericMethod<is, BufferGetterImpl>(cx, args);
+        return CallNonGenericMethod(cx, is, BufferGetterImpl, args);
     }
 
     // Define an accessor for a read-only property that invokes a native getter