Revert 12534006

runtime/vm/intrinsifier_x64.cc

Index: runtime/vm/intrinsifier_x64.cc
diff --git a/runtime/vm/intrinsifier_x64.cc b/runtime/vm/intrinsifier_x64.cc
index 03fc7acb5c6afa59694cde400a9d82696203fe09..3119fdb7594390d8729ab5b641aeaa325ab02eb4 100644
--- a/runtime/vm/intrinsifier_x64.cc
+++ b/runtime/vm/intrinsifier_x64.cc
@@ -454,13 +454,6 @@ void TestByteArrayGetIndex(Assembler* assembler, Label* fall_through) {
   /* RDI: untagged array length. */                                            \
   __ cmpq(RDI, Immediate(max_len));                                            \
   __ j(GREATER, &fall_through);                                                \
-  /* Special case for scaling by 16. */                                        \
-  if (scale_factor == TIMES_16) {                                              \
-    /* double length of array. */                                              \
-    __ addq(RDI, RDI);                                                         \
-    /* only scale by 8. */                                                     \
-    scale_factor = TIMES_8;                                                    \
-  }                                                                            \
   const intptr_t fixed_size = sizeof(Raw##type_name) + kObjectAlignment - 1;   \
   __ leaq(RDI, Address(RDI, scale_factor, fixed_size));                        \
   __ andq(RDI, Immediate(-kObjectAlignment));                                  \
@@ -537,14 +530,12 @@ void TestByteArrayGetIndex(Assembler* assembler, Label* fall_through) {
   __ Bind(&fall_through);                                                      \
 
 
-#define SCALARLIST_ALLOCATOR(clazz, scale_)                                    \
+#define SCALARLIST_ALLOCATOR(clazz, scale)                                     \
 bool Intrinsifier::clazz##_new(Assembler* assembler) {                         \
-  ScaleFactor scale = scale_;                                                  \
   TYPED_ARRAY_ALLOCATION(clazz, k##clazz##Cid, clazz::kMaxElements, scale);    \
   return false;                                                                \
 }                                                                              \
 bool Intrinsifier::clazz##_factory(Assembler* assembler) {                     \
-  ScaleFactor scale = scale_;                                                  \
   TYPED_ARRAY_ALLOCATION(clazz, k##clazz##Cid, clazz::kMaxElements, scale);    \
   return false;                                                                \
 }
@@ -626,7 +617,6 @@ static ScaleFactor GetScaleFactor(intptr_t size) {
     case 2: return TIMES_2;
     case 4: return TIMES_4;
     case 8: return TIMES_8;
-    case 16: return TIMES_16;
   }
   UNREACHABLE();
   return static_cast<ScaleFactor>(0);