Bug 1530937 part 18 - Rename DoNew{Array,Object} to DoNew{Array,Object}Fallback and remove unused NewObject_WithTemplate IC kind. r=tcampbell

Depends on D23137

Differential Revision: https://phabricator.services.mozilla.com/D23142

--HG--
extra : moz-landing-system : lando

js/src/jit/BaselineIC.cpp

@@ -5784,8 +5784,9 @@ bool ICCompare_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
 // NewArray_Fallback
 //
 
-bool DoNewArray(JSContext* cx, BaselineFrame* frame, ICNewArray_Fallback* stub,
-                uint32_t length, MutableHandleValue res) {
+bool DoNewArrayFallback(JSContext* cx, BaselineFrame* frame,
+                        ICNewArray_Fallback* stub, uint32_t length,
+                        MutableHandleValue res) {
   stub->incrementEnteredCount();
   FallbackICSpew(cx, stub, "NewArray");
 
@@ -5828,14 +5829,14 @@ bool ICNewArray_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
 
   using Fn = bool (*)(JSContext*, BaselineFrame*, ICNewArray_Fallback*,
                       uint32_t, MutableHandleValue);
-  return tailCallVM<Fn, DoNewArray>(masm);
+  return tailCallVM<Fn, DoNewArrayFallback>(masm);
 }
 
 //
 // NewObject_Fallback
 //
-bool DoNewObject(JSContext* cx, BaselineFrame* frame,
-                 ICNewObject_Fallback* stub, MutableHandleValue res) {
+bool DoNewObjectFallback(JSContext* cx, BaselineFrame* frame,
+                         ICNewObject_Fallback* stub, MutableHandleValue res) {
   stub->incrementEnteredCount();
   FallbackICSpew(cx, stub, "NewObject");
 
@@ -5882,7 +5883,7 @@ bool ICNewObject_Fallback::Compiler::generateStubCode(MacroAssembler& masm) {
 
   using Fn = bool (*)(JSContext*, BaselineFrame*, ICNewObject_Fallback*,
                       MutableHandleValue);
-  return tailCallVM<Fn, DoNewObject>(masm);
+  return tailCallVM<Fn, DoNewObjectFallback>(masm);
 }
 
 }  // namespace jit

js/src/jit/BaselineIC.h

@@ -2818,12 +2818,13 @@ extern bool DoBinaryArithFallback(JSContext* cx, BaselineFrame* frame,
                                   ICBinaryArith_Fallback* stub, HandleValue lhs,
                                   HandleValue rhs, MutableHandleValue ret);
 
-extern bool DoNewArray(JSContext* cx, BaselineFrame* frame,
-                       ICNewArray_Fallback* stub, uint32_t length,
-                       MutableHandleValue res);
+extern bool DoNewArrayFallback(JSContext* cx, BaselineFrame* frame,
+                               ICNewArray_Fallback* stub, uint32_t length,
+                               MutableHandleValue res);
 
-extern bool DoNewObject(JSContext* cx, BaselineFrame* frame,
-                        ICNewObject_Fallback* stub, MutableHandleValue res);
+extern bool DoNewObjectFallback(JSContext* cx, BaselineFrame* frame,
+                                ICNewObject_Fallback* stub,
+                                MutableHandleValue res);
 
 extern bool DoCompareFallback(JSContext* cx, BaselineFrame* frame,
                               ICCompare_Fallback* stub, HandleValue lhs,

js/src/jit/BaselineICList.h

@@ -28,7 +28,6 @@ namespace jit {
                                       \
   _(NewArray_Fallback)                \
   _(NewObject_Fallback)               \
-  _(NewObject_WithTemplate)           \
                                       \
   _(ToBool_Fallback)                  \
                                       \

js/src/jit/VMFunctionList-inl.h

@@ -266,8 +266,8 @@ namespace jit {
   _(DoHasOwnFallback, js::jit::DoHasOwnFallback, 2)             \
   _(DoInFallback, js::jit::DoInFallback, 2)                     \
   _(DoInstanceOfFallback, js::jit::DoInstanceOfFallback, 2)     \
-  _(DoNewArray, js::jit::DoNewArray, 0)                         \
-  _(DoNewObject, js::jit::DoNewObject, 0)                       \
+  _(DoNewArrayFallback, js::jit::DoNewArrayFallback, 0)         \
+  _(DoNewObjectFallback, js::jit::DoNewObjectFallback, 0)       \
   _(DoRestFallback, js::jit::DoRestFallback, 0)                 \
   _(DoSetElemFallback, js::jit::DoSetElemFallback, 2)           \
   _(DoSetPropFallback, js::jit::DoSetPropFallback, 1)           \