From 2e150bdf08374d19b066c1098409f234178c9813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Z=C3=BCnd?= <szuend@chromium.org>
Date: Tue, 12 Mar 2019 16:29:44 +0100
Subject: [PATCH] [cleanup] Remove dead code from Array#sort
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

R=jgruber@chromium.org

Bug: v8:8834
Change-Id: I36b3fc2e29111054caf395b6875f238bf43ab3de
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1518177
Auto-Submit: Simon Zünd <szuend@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Simon Zünd <szuend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#60194}
---
 third_party/v8/builtins/array-sort.tq | 30 +++++++--------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/third_party/v8/builtins/array-sort.tq b/third_party/v8/builtins/array-sort.tq
index 82b35029c9..90959cf0ac 100644
--- a/third_party/v8/builtins/array-sort.tq
+++ b/third_party/v8/builtins/array-sort.tq
@@ -292,21 +292,6 @@ namespace array {
     }
   }
 
-  UnsafeCast<CompareBuiltinFn>(implicit context: Context)(o: Object):
-      CompareBuiltinFn {
-    return %RawDownCast<CompareBuiltinFn>(o);
-  }
-  UnsafeCast<LoadFn>(implicit context: Context)(o: Object): LoadFn {
-    return %RawDownCast<LoadFn>(o);
-  }
-  UnsafeCast<StoreFn>(implicit context: Context)(o: Object): StoreFn {
-    return %RawDownCast<StoreFn>(o);
-  }
-  UnsafeCast<CanUseSameAccessorFn>(implicit context: Context)(o: Object):
-      CanUseSameAccessorFn {
-    return %RawDownCast<CanUseSameAccessorFn>(o);
-  }
-
   builtin SortCompareDefault(
       context: Context, comparefn: Object, x: Object, y: Object): Number {
     assert(comparefn == Undefined);
@@ -353,14 +338,14 @@ namespace array {
   builtin CanUseSameAccessor<ElementsAccessor: type>(
       context: Context, receiver: JSReceiver, initialReceiverMap: Object,
       initialReceiverLength: Number): Boolean {
-    const a: JSArray = UnsafeCast<JSArray>(receiver);
-    if (a.map != initialReceiverMap) return False;
+    if (receiver.map != initialReceiverMap) return False;
 
     assert(TaggedIsSmi(initialReceiverLength));
-    let originalLength: Smi = UnsafeCast<Smi>(initialReceiverLength);
-    if (UnsafeCast<Smi>(a.length) != originalLength) return False;
+    const array = UnsafeCast<JSArray>(receiver);
+    const originalLength = UnsafeCast<Smi>(initialReceiverLength);
 
-    return True;
+    return SelectBooleanConstant(
+        UnsafeCast<Smi>(array.length) == originalLength);
   }
 
   CanUseSameAccessor<GenericElementsAccessor>(
@@ -373,8 +358,7 @@ namespace array {
   CanUseSameAccessor<DictionaryElements>(
       context: Context, receiver: JSReceiver, initialReceiverMap: Object,
       initialReceiverLength: Number): Boolean {
-    let obj: JSReceiver = UnsafeCast<JSReceiver>(receiver);
-    return SelectBooleanConstant(obj.map == initialReceiverMap);
+    return SelectBooleanConstant(receiver.map == initialReceiverMap);
   }
 
   // Re-loading the stack-size is done in a few places. The small macro allows
@@ -423,7 +407,7 @@ namespace array {
       sortState: SortState, requestedSize: Smi): FixedArray {
     const minSize: Smi = SmiMax(kSortStateTempSize, requestedSize);
 
-    const currentSize: Smi = UnsafeCast<Smi>(sortState.tempArray.length);
+    const currentSize: Smi = sortState.tempArray.length;
     if (currentSize >= minSize) {
       return sortState.tempArray;
     }