[runtime] Use ThrowCalledNonCallable

LeszekSwirski · V8 LUCI CQ · commit a11e68f0845a · 2023-06-07T11:47:22.000Z
Call the ThrowCalledNonCallable runtime function where appropriate, rather than the generic ThrowNewError. This ensures that it does the appropriate call site rendering. Change-Id: I25ef5150ce7b87779f7591a18deb1595dac3705f Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4596060 Auto-Submit: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Tobias Tebbi <tebbi@chromium.org> Reviewed-by: Tobias Tebbi <tebbi@chromium.org> Cr-Commit-Position: refs/heads/main@{#88112}
diff --git a/src/builtins/array-every.tq b/src/builtins/array-every.tq
@@ -138,7 +138,7 @@ ArrayEvery(
           o, callbackfn, thisArg, Undefined, o, kValue, len, Undefined);
     }
   } label TypeError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-filter.tq b/src/builtins/array-filter.tq
@@ -193,7 +193,7 @@ ArrayFilter(
     return ArrayFilterLoopContinuation(
         o, callbackfn, thisArg, output, o, k, len, to);
   } label TypeError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-find.tq b/src/builtins/array-find.tq
@@ -145,7 +145,7 @@ ArrayPrototypeFind(
       return ArrayFindLoopContinuation(o, callbackfn, thisArg, o, k, len);
     }
   } label NotCallableError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-findindex.tq b/src/builtins/array-findindex.tq
@@ -145,7 +145,7 @@ ArrayPrototypeFindIndex(
       return ArrayFindIndexLoopContinuation(o, callbackfn, thisArg, o, k, len);
     }
   } label NotCallableError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-findlast.tq b/src/builtins/array-findlast.tq
@@ -104,7 +104,7 @@ ArrayPrototypeFindLast(
       return ArrayFindLastLoopContinuation(predicate, thisArg, o, k);
     }
   } label NotCallableError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-findlastindex.tq b/src/builtins/array-findlastindex.tq
@@ -105,7 +105,7 @@ ArrayPrototypeFindLastIndex(
       return ArrayFindLastIndexLoopContinuation(predicate, thisArg, o, k);
     }
   } label NotCallableError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-foreach.tq b/src/builtins/array-foreach.tq
@@ -122,7 +122,7 @@ ArrayForEach(
     return ArrayForEachLoopContinuation(
         o, callbackfn, thisArg, Undefined, o, k, len, Undefined);
   } label TypeError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-from.tq b/src/builtins/array-from.tq
@@ -35,7 +35,7 @@ ArrayFrom(js-implicit context: NativeContext, receiver: JSAny)(...arguments):
   } else {
     // a. If IsCallable(mapfn) is false, throw a TypeError exception.
     if (!Is<Callable>(mapfn)) deferred {
-        ThrowTypeError(MessageTemplate::kCalledNonCallable, mapfn);
+        ThrowCalledNonCallable(mapfn);
       }
     // b. Let mapping be true.
     mapping = true;
diff --git a/src/builtins/array-join.tq b/src/builtins/array-join.tq
@@ -88,7 +88,7 @@ transitioning builtin ConvertToLocaleString(
 
     return ToString_Inline(result);
   } label TypeError {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, prop);
+    ThrowCalledNonCallable(prop);
   }
 }
 
diff --git a/src/builtins/array-map.tq b/src/builtins/array-map.tq
@@ -14,7 +14,7 @@ ArrayMapPreLoopLazyDeoptContinuation(
   const numberLength = Cast<Number>(length) otherwise unreachable;
 
   const callbackfn = Cast<Callable>(callback)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, callback);
+      otherwise ThrowCalledNonCallable(callback);
   return ArrayMapLoopContinuation(
       jsreceiver, callbackfn, thisArg, outputArray, jsreceiver, kZero,
       numberLength);
@@ -269,7 +269,7 @@ ArrayMap(
 
     return ArrayMapLoopContinuation(o, callbackfn, thisArg, array, o, k, len);
   } label TypeError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-reduce-right.tq b/src/builtins/array-reduce-right.tq
@@ -191,7 +191,7 @@ ArrayReduceRight(
           o, callbackfn, accumulator, o, value, len);
     }
   } label NoCallableError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-reduce.tq b/src/builtins/array-reduce.tq
@@ -190,7 +190,7 @@ ArrayReduce(
           o, callbackfn, accumulator, o, value, len);
     }
   } label NoCallableError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/array-some.tq b/src/builtins/array-some.tq
@@ -138,7 +138,7 @@ ArraySome(
           o, callbackfn, thisArg, Undefined, o, kValue, len, Undefined);
     }
   } label TypeError deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/collections.tq b/src/builtins/collections.tq
@@ -206,14 +206,14 @@ transitioning macro GetSetRecord(implicit context: Context)(
 
   // 8. If IsCallable(has) is false, throw a TypeError exception.
   has = Cast<Callable>(has)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, kHasString);
+      otherwise ThrowCalledNonCallable(kHasString);
 
   // 9. Let keys be ? Get(obj, "keys").
   let keys = GetProperty(obj, kKeysString);
 
   // 10. If IsCallable(keys) is false, throw a TypeError exception.
   keys = Cast<Callable>(keys)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, kKeysString);
+      otherwise ThrowCalledNonCallable(kKeysString);
 
   // 11. Return a new Set Record { [[Set]]: obj, [[Size]]: intSize, [[Has]]:
   // has, [[Keys]]: keys }.
@@ -235,7 +235,7 @@ transitioning macro GetKeysIterator(implicit context: Context)(
 
   // 4. If IsCallable(nextMethod) is false, throw a TypeError exception.
   Cast<Callable>(nextMethod)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, kNextString);
+      otherwise ThrowCalledNonCallable(kNextString);
 
   // 5. Return a new Iterator Record { [[Iterator]]: keysIter, [[NextMethod]]:
   // nextMethod, [[Done]]: false }.
diff --git a/src/builtins/iterator-helpers.tq b/src/builtins/iterator-helpers.tq
@@ -143,7 +143,7 @@ transitioning javascript builtin IteratorPrototypeMap(
 
   // 3. If IsCallable(mapper) is false, throw a TypeError exception.
   const mapper = Cast<Callable>(mapper)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, methodName);
+      otherwise ThrowCalledNonCallable(methodName);
 
   // 4. Let iterated be ? GetIteratorDirect(O).
   const iterated = GetIteratorDirect(o);
@@ -239,7 +239,7 @@ transitioning javascript builtin IteratorPrototypeFilter(
 
   // 3. If IsCallable(predicate) is false, throw a TypeError exception.
   const predicate = Cast<Callable>(predicate)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, methodName);
+      otherwise ThrowCalledNonCallable(methodName);
 
   // 4. Let iterated be ? GetIteratorDirect(O).
   const iterated = GetIteratorDirect(o);
@@ -679,7 +679,7 @@ transitioning javascript builtin IteratorPrototypeReduce(
 
   // 3. If IsCallable(reducer) is false, throw a TypeError exception.
   const reducer = Cast<Callable>(arguments[0])
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, methodName);
+      otherwise ThrowCalledNonCallable(methodName);
 
   // 4. Let iterated be ? GetIteratorDirect(O).
   const iterated = GetIteratorDirect(o);
@@ -798,7 +798,7 @@ transitioning javascript builtin IteratorPrototypeForEach(
 
   // 3. If IsCallable(fn) is false, throw a TypeError exception.
   const fn = Cast<Callable>(fn)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, methodName);
+      otherwise ThrowCalledNonCallable(methodName);
 
   // 4. Let iterated be ? GetIteratorDirect(O).
   const iterated = GetIteratorDirect(o);
@@ -854,7 +854,7 @@ transitioning javascript builtin IteratorPrototypeSome(
 
   // 3. If IsCallable(predicate) is false, throw a TypeError exception.
   const predicate = Cast<Callable>(predicate)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, methodName);
+      otherwise ThrowCalledNonCallable(methodName);
 
   // 4. Let iterated be ? GetIteratorDirect(O).
   const iterated = GetIteratorDirect(o);
@@ -918,7 +918,7 @@ transitioning javascript builtin IteratorPrototypeEvery(
 
   // 3. If IsCallable(predicate) is false, throw a TypeError exception.
   const predicate = Cast<Callable>(predicate)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, methodName);
+      otherwise ThrowCalledNonCallable(methodName);
 
   // 4. Let iterated be ? GetIteratorDirect(O).
   const iterated = GetIteratorDirect(o);
@@ -982,7 +982,7 @@ transitioning javascript builtin IteratorPrototypeFind(
 
   // 3. If IsCallable(predicate) is false, throw a TypeError exception.
   const predicate = Cast<Callable>(predicate)
-      otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, methodName);
+      otherwise ThrowCalledNonCallable(methodName);
 
   // 4. Let iterated be ? GetIteratorDirect(O).
   const iterated = GetIteratorDirect(o);
diff --git a/src/builtins/typed-array-every.tq b/src/builtins/typed-array-every.tq
@@ -71,7 +71,7 @@ TypedArrayPrototypeEvery(
   } label IsDetachedOrOutOfBounds deferred {
     ThrowTypeError(MessageTemplate::kDetachedOperation, kBuiltinNameEvery);
   } label NotCallable deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/builtins/typed-array-filter.tq b/src/builtins/typed-array-filter.tq
@@ -22,7 +22,7 @@ transitioning javascript builtin TypedArrayPrototypeFilter(
         otherwise IsDetachedOrOutOfBounds;
     // 4. If IsCallable(callbackfn) is false, throw a TypeError exception.
     const callbackfn = Cast<Callable>(arguments[0])
-        otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+        otherwise ThrowCalledNonCallable(arguments[0]);
 
     // 5. If thisArg is present, let T be thisArg; else let T be undefined.
     const thisArg: JSAny = arguments[1];
diff --git a/src/builtins/typed-array-find.tq b/src/builtins/typed-array-find.tq
@@ -69,7 +69,7 @@ TypedArrayPrototypeFind(
     const thisArg = arguments[1];
     return FindAllElements(attachedArrayAndLength, predicate, thisArg);
   } label NotCallable deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   } label NotTypedArray deferred {
     ThrowTypeError(MessageTemplate::kNotTypedArray, kBuiltinNameFind);
   } label IsDetachedOrOutOfBounds deferred {
diff --git a/src/builtins/typed-array-findindex.tq b/src/builtins/typed-array-findindex.tq
@@ -63,7 +63,7 @@ TypedArrayPrototypeFindIndex(
     const thisArg = arguments[1];
     return FindIndexAllElements(attachedArrayAndLength, predicate, thisArg);
   } label NotCallable deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   } label NotTypedArray deferred {
     ThrowTypeError(MessageTemplate::kNotTypedArray, kBuiltinNameFindIndex);
   } label IsDetachedOrOutOfBounds deferred {
diff --git a/src/builtins/typed-array-findlast.tq b/src/builtins/typed-array-findlast.tq
@@ -68,7 +68,7 @@ TypedArrayPrototypeFindLast(
     const thisArg = arguments[1];
     return FindLastAllElements(attachedArrayAndLength, predicate, thisArg);
   } label NotCallable deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   } label NotTypedArray deferred {
     ThrowTypeError(MessageTemplate::kNotTypedArray, kBuiltinNameFindLast);
   } label IsDetachedOrOutOfBounds deferred {
diff --git a/src/builtins/typed-array-findlastindex.tq b/src/builtins/typed-array-findlastindex.tq
@@ -68,7 +68,7 @@ TypedArrayPrototypeFindLastIndex(
     const thisArg = arguments[1];
     return FindLastIndexAllElements(attachedArrayAndLength, predicate, thisArg);
   } label NotCallable deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   } label NotTypedArray deferred {
     ThrowTypeError(MessageTemplate::kNotTypedArray, kBuiltinNameFindLastIndex);
   } label IsDetachedOrOutOfBounds deferred {
diff --git a/src/builtins/typed-array-foreach.tq b/src/builtins/typed-array-foreach.tq
@@ -63,7 +63,7 @@ TypedArrayPrototypeForEach(js-implicit context: NativeContext, receiver: JSAny)(
     const thisArg = arguments[1];
     return ForEachAllElements(attachedArrayAndLength, callbackfn, thisArg);
   } label NotCallable deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   } label NotTypedArray deferred {
     ThrowTypeError(MessageTemplate::kNotTypedArray, kBuiltinNameForEach);
   } label IsDetachedOrOutOfBounds deferred {
diff --git a/src/builtins/typed-array-from.tq b/src/builtins/typed-array-from.tq
@@ -35,7 +35,7 @@ TypedArrayFrom(js-implicit context: NativeContext, receiver: JSAny)(
     //   b. Let mapping be true.
     const mapping: bool = mapfnObj != Undefined;
     if (mapping && !Is<Callable>(mapfnObj)) deferred {
-        ThrowTypeError(MessageTemplate::kCalledNonCallable, mapfnObj);
+        ThrowCalledNonCallable(mapfnObj);
       }
 
     // We split up this builtin differently to the way it is written in the
diff --git a/src/builtins/typed-array-reduce.tq b/src/builtins/typed-array-reduce.tq
@@ -65,7 +65,7 @@ TypedArrayPrototypeReduce(
     const initialValue = arguments.length >= 2 ? arguments[1] : TheHole;
     return ReduceAllElements(attachedArrayAndLength, callbackfn, initialValue);
   } label NotCallable deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   } label NotTypedArray deferred {
     ThrowTypeError(MessageTemplate::kNotTypedArray, kBuiltinNameReduce);
   } label IsDetachedOrOutOfBounds deferred {
diff --git a/src/builtins/typed-array-reduceright.tq b/src/builtins/typed-array-reduceright.tq
@@ -69,7 +69,7 @@ TypedArrayPrototypeReduceRight(
     return ReduceRightAllElements(
         attachedArrayAndLength, callbackfn, initialValue);
   } label NotCallable deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   } label NotTypedArray deferred {
     ThrowTypeError(MessageTemplate::kNotTypedArray, kBuiltinNameReduceRight);
   } label IsDetachedOrOutOfBounds deferred {
diff --git a/src/builtins/typed-array-some.tq b/src/builtins/typed-array-some.tq
@@ -73,7 +73,7 @@ TypedArrayPrototypeSome(
   } label IsDetachedOrOutOfBounds deferred {
     ThrowTypeError(MessageTemplate::kDetachedOperation, kBuiltinNameSome);
   } label NotCallable deferred {
-    ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);
+    ThrowCalledNonCallable(arguments[0]);
   }
 }
 }
diff --git a/src/compiler/js-call-reducer.cc b/src/compiler/js-call-reducer.cc
@@ -349,10 +349,8 @@ class JSCallReducerAssembler : public JSGraphAssembler {
                           FrameState frame_state) {
     IfNot(ObjectIsCallable(maybe_callable))
         .Then(_ {
-          JSCallRuntime2(Runtime::kThrowTypeError,
-                         NumberConstant(static_cast<double>(
-                             MessageTemplate::kCalledNonCallable)),
-                         maybe_callable, ContextInput(), frame_state);
+          JSCallRuntime1(Runtime::kThrowCalledNonCallable, maybe_callable,
+                         ContextInput(), frame_state);
           Unreachable();  // The runtime call throws unconditionally.
         })
         .ExpectTrue();
diff --git a/test/mjsunit/array-tolocalestring.js b/test/mjsunit/array-tolocalestring.js
@@ -60,7 +60,7 @@
     toLocaleString: 7
   }
   arr[0] = obj;
-  assertThrows(() => arr.toLocaleString(), TypeError, '7 is not a function');
+  assertThrows(() => arr.toLocaleString(), TypeError, 'number 7 is not a function');
 
   // Verifies cycle detection still works properly after thrown error.
   arr[0] = {
diff --git a/test/mjsunit/messages.js b/test/mjsunit/messages.js
@@ -60,7 +60,7 @@ test(function() {
 // kCalledNonCallable
 test(function() {
   [].forEach(1);
-}, "1 is not a function", TypeError);
+}, "number 1 is not a function", TypeError);
 
 // kCalledOnNonObject
 test(function() {
diff --git a/test/mjsunit/regress/regress-crbug-770581.js b/test/mjsunit/regress/regress-crbug-770581.js
@@ -16,7 +16,7 @@ function message_of_f() {
   }
 }
 
-assertEquals("TypeError: a teapot is not a function", message_of_f());
-assertEquals("TypeError: a teapot is not a function", message_of_f());
+assertEquals("TypeError: string \"a teapot\" is not a function", message_of_f());
+assertEquals("TypeError: string \"a teapot\" is not a function", message_of_f());
 %OptimizeFunctionOnNextCall(f);
-assertEquals("TypeError: a teapot is not a function", message_of_f());
+assertEquals("TypeError: string \"a teapot\" is not a function", message_of_f());
diff --git a/test/webkit/array-every-expected.txt b/test/webkit/array-every-expected.txt
@@ -53,10 +53,10 @@ PASS [12, 5, 8, 130, 44].every(isBigEnoughAndException) threw exception exceptio
 PASS [12, 54, 18, 130, 44].every(isBigEnoughAndException) threw exception exception from function.
 
 5.0 Wrong Type for Callback Test
-PASS [12, 5, 8, 130, 44].every(5) threw exception TypeError: 5 is not a function.
-PASS [12, 5, 8, 130, 44].every('wrong') threw exception TypeError: wrong is not a function.
-PASS [12, 5, 8, 130, 44].every(new Object()) threw exception TypeError: #<Object> is not a function.
-PASS [12, 5, 8, 130, 44].every(null) threw exception TypeError: null is not a function.
+PASS [12, 5, 8, 130, 44].every(5) threw exception TypeError: number 5 is not a function.
+PASS [12, 5, 8, 130, 44].every('wrong') threw exception TypeError: string "wrong" is not a function.
+PASS [12, 5, 8, 130, 44].every(new Object()) threw exception TypeError: object is not a function.
+PASS [12, 5, 8, 130, 44].every(null) threw exception TypeError: object null is not a function.
 PASS [12, 5, 8, 130, 44].every(undefined) threw exception TypeError: undefined is not a function.
 PASS [12, 5, 8, 130, 44].every() threw exception TypeError: undefined is not a function.
 
diff --git a/test/webkit/fast/js/toString-overrides-expected.txt b/test/webkit/fast/js/toString-overrides-expected.txt
@@ -28,10 +28,10 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS [1].toString() is '1'
 PASS [1].toLocaleString() is 'toLocaleString'
-FAIL [1].toLocaleString() should be 1. Threw exception TypeError: invalid is not a function
+FAIL [1].toLocaleString() should be 1. Threw exception TypeError: string "invalid" is not a function
 PASS [/r/].toString() is 'toString2'
 PASS [/r/].toLocaleString() is 'toLocaleString2'
-FAIL [/r/].toLocaleString() should be toString2. Threw exception TypeError: invalid is not a function
+FAIL [/r/].toLocaleString() should be toString2. Threw exception TypeError: string "invalid" is not a function
 PASS caught is true
 PASS successfullyParsed is true
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ ArrayEvery(`
`138`	`138`	`o, callbackfn, thisArg, Undefined, o, kValue, len, Undefined);`
`139`	`139`	`}`
`140`	`140`	`} label TypeError deferred {`
`141`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);`
	`141`	`+ ThrowCalledNonCallable(arguments[0]);`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ ArrayFilter(`
`193`	`193`	`return ArrayFilterLoopContinuation(`
`194`	`194`	`o, callbackfn, thisArg, output, o, k, len, to);`
`195`	`195`	`} label TypeError deferred {`
`196`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);`
	`196`	`+ ThrowCalledNonCallable(arguments[0]);`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ ArrayPrototypeFind(`
`145`	`145`	`return ArrayFindLoopContinuation(o, callbackfn, thisArg, o, k, len);`
`146`	`146`	`}`
`147`	`147`	`} label NotCallableError deferred {`
`148`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);`
	`148`	`+ ThrowCalledNonCallable(arguments[0]);`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ ArrayPrototypeFindIndex(`
`145`	`145`	`return ArrayFindIndexLoopContinuation(o, callbackfn, thisArg, o, k, len);`
`146`	`146`	`}`
`147`	`147`	`} label NotCallableError deferred {`
`148`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);`
	`148`	`+ ThrowCalledNonCallable(arguments[0]);`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ ArrayPrototypeFindLast(`
`104`	`104`	`return ArrayFindLastLoopContinuation(predicate, thisArg, o, k);`
`105`	`105`	`}`
`106`	`106`	`} label NotCallableError deferred {`
`107`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);`
	`107`	`+ ThrowCalledNonCallable(arguments[0]);`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ ArrayPrototypeFindLastIndex(`
`105`	`105`	`return ArrayFindLastIndexLoopContinuation(predicate, thisArg, o, k);`
`106`	`106`	`}`
`107`	`107`	`} label NotCallableError deferred {`
`108`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);`
	`108`	`+ ThrowCalledNonCallable(arguments[0]);`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ ArrayForEach(`
`122`	`122`	`return ArrayForEachLoopContinuation(`
`123`	`123`	`o, callbackfn, thisArg, Undefined, o, k, len, Undefined);`
`124`	`124`	`} label TypeError deferred {`
`125`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);`
	`125`	`+ ThrowCalledNonCallable(arguments[0]);`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ ArrayFrom(js-implicit context: NativeContext, receiver: JSAny)(...arguments):`
`35`	`35`	`} else {`
`36`	`36`	`// a. If IsCallable(mapfn) is false, throw a TypeError exception.`
`37`	`37`	`if (!Is<Callable>(mapfn)) deferred {`
`38`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, mapfn);`
	`38`	`+ ThrowCalledNonCallable(mapfn);`
`39`	`39`	`}`
`40`	`40`	`// b. Let mapping be true.`
`41`	`41`	`mapping = true;`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ transitioning builtin ConvertToLocaleString(`
`88`	`88`
`89`	`89`	`return ToString_Inline(result);`
`90`	`90`	`} label TypeError {`
`91`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, prop);`
	`91`	`+ ThrowCalledNonCallable(prop);`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ ArrayMapPreLoopLazyDeoptContinuation(`
`14`	`14`	`const numberLength = Cast<Number>(length) otherwise unreachable;`
`15`	`15`
`16`	`16`	`const callbackfn = Cast<Callable>(callback)`
`17`		`- otherwise ThrowTypeError(MessageTemplate::kCalledNonCallable, callback);`
	`17`	`+ otherwise ThrowCalledNonCallable(callback);`
`18`	`18`	`return ArrayMapLoopContinuation(`
`19`	`19`	`jsreceiver, callbackfn, thisArg, outputArray, jsreceiver, kZero,`
`20`	`20`	`numberLength);`
`@@ -269,7 +269,7 @@ ArrayMap(`
`269`	`269`
`270`	`270`	`return ArrayMapLoopContinuation(o, callbackfn, thisArg, array, o, k, len);`
`271`	`271`	`} label TypeError deferred {`
`272`		`- ThrowTypeError(MessageTemplate::kCalledNonCallable, arguments[0]);`
	`272`	`+ ThrowCalledNonCallable(arguments[0]);`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`	`}`