[torque] Clean up usage of NonNumberToNumber

Bug: v8:9891

Change-Id: I601dd2a4e1c7d1e3818a55b92e83ce6b072c7ad0
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2238486Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Bill Budge <bbudge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68306}

src/builtins/base.tq

@@ -474,7 +474,7 @@ extern macro Print(Object);
 extern macro DebugBreak();
 
 // ES6 7.1.4 ToInteger ( argument )
-transitioning macro ToIntegerImpl(implicit context: Context)(input: Object):
+transitioning macro ToIntegerImpl(implicit context: Context)(input: JSAny):
     Number {
   let input = input;
 
@@ -493,28 +493,28 @@ transitioning macro ToIntegerImpl(implicit context: Context)(input: Object):
         assert(IsNumberNormalized(result));
         return result;
       }
-      case (ho: HeapObject): {
-        input = math::NonNumberToNumber(ho);
+      case (a: JSAnyNotNumber): {
+        input = conversion::NonNumberToNumber(a);
       }
     }
   }
   unreachable;
 }
 
-transitioning builtin ToInteger(implicit context: Context)(input: Object):
+transitioning builtin ToInteger(implicit context: Context)(input: JSAny):
     Number {
   return ToIntegerImpl(input);
 }
 
 @export
-transitioning macro ToInteger_Inline(implicit context: Context)(input: Object):
+transitioning macro ToInteger_Inline(implicit context: Context)(input: JSAny):
     Number {
   typeswitch (input) {
     case (s: Smi): {
       return s;
     }
-    case (ho: HeapObject): {
-      return ToInteger(ho);
+    case (JSAny): {
+      return ToInteger(input);
     }
   }
 }

src/builtins/math.tq

@@ -4,9 +4,6 @@
 
 namespace math {
 
-extern transitioning builtin
-NonNumberToNumber(implicit context: Context)(HeapObject): Number;
-
 transitioning macro ReduceToSmiOrFloat64(implicit context: Context)(x: JSAny):
     never
     labels SmiResult(Smi), Float64Result(float64) {
@@ -20,7 +17,7 @@ transitioning macro ReduceToSmiOrFloat64(implicit context: Context)(x: JSAny):
         goto Float64Result(Convert<float64>(h));
       }
       case (a: JSAnyNotNumber): {
-        x1 = NonNumberToNumber(a);
+        x1 = conversion::NonNumberToNumber(a);
       }
     }
   }