Inline ByteArray setters like setUint8 in the optimizer.

runtime/vm/intermediate_language_x64.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 1149 matching lines @@
 
 
 LocationSummary* StoreIndexedInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 3;
   const intptr_t kNumTemps = 0;
   LocationSummary* locs =
       new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
   locs->set_in(0, Location::RequiresRegister());
   // The smi index is either untagged (element size == 1), or it is left smi
   // tagged (for all element sizes > 1).
-  intptr_t index_scale = FlowGraphCompiler::ElementSizeFor(class_id());
-  if (index_scale == 1) {
+  if (index_scale() == 1) {
     locs->set_in(1, CanBeImmediateIndex(index(), class_id())
                       ? Location::Constant(
                           index()->definition()->AsConstant()->value())
                       : Location::WritableRegister());
   } else {
     locs->set_in(1, CanBeImmediateIndex(index(), class_id())
                       ? Location::Constant(
                           index()->definition()->AsConstant()->value())
                       : Location::RequiresRegister());
   }
@@ skipping 35 matching lines @@
       return NULL;
   }
   return locs;
 }
 
 
 void StoreIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register array = locs()->in(0).reg();
   Location index = locs()->in(1);
 
-  intptr_t index_scale = FlowGraphCompiler::ElementSizeFor(class_id());
   Address element_address(kNoRegister, 0);
   if ((class_id() == kExternalUint8ArrayCid) ||
       (class_id() == kExternalUint8ClampedArrayCid)) {
     Register temp = locs()->temp(0).reg();
     element_address = index.IsRegister()
         ? FlowGraphCompiler::ExternalElementAddressForRegIndex(
-            class_id(), index_scale, temp, index.reg())
+            class_id(), index_scale(), temp, index.reg())
         : FlowGraphCompiler::ExternalElementAddressForIntIndex(
-            class_id(), index_scale, temp,
+            class_id(), index_scale(), temp,
             Smi::Cast(index.constant()).Value());
     __ movq(temp,
             FieldAddress(array, ExternalUint8Array::data_offset()));
   } else {
     element_address = index.IsRegister()
         ? FlowGraphCompiler::ElementAddressForRegIndex(
-            class_id(), index_scale, array, index.reg())
+            class_id(), index_scale(), array, index.reg())
         : FlowGraphCompiler::ElementAddressForIntIndex(
-            class_id(), index_scale, array,
+            class_id(), index_scale(), array,
             Smi::Cast(index.constant()).Value());
   }
 
+  if ((index_scale() == 1) && index.IsRegister()) {
+    __ SmiUntag(index.reg());
+  }
   switch (class_id()) {
     case kArrayCid:
       if (ShouldEmitStoreBarrier()) {
         Register value = locs()->in(2).reg();
         __ StoreIntoObject(array, element_address, value);
       } else if (locs()->in(2).IsConstant()) {
         const Object& constant = locs()->in(2).constant();
         __ StoreObject(element_address, constant);
       } else {
         Register value = locs()->in(2).reg();
         __ StoreIntoObjectNoBarrier(array, element_address, value);
       }
       break;
     case kInt8ArrayCid:
     case kUint8ArrayCid:
     case kExternalUint8ArrayCid:
-      if (index.IsRegister()) {
-        __ SmiUntag(index.reg());
-      }
       if (locs()->in(2).IsConstant()) {
         const Smi& constant = Smi::Cast(locs()->in(2).constant());
         __ movb(element_address,
                 Immediate(static_cast<int8_t>(constant.Value())));
       } else {
         ASSERT(locs()->in(2).reg() == RAX);
         __ SmiUntag(RAX);
         __ movb(element_address, RAX);
       }
       break;
     case kUint8ClampedArrayCid:
     case kExternalUint8ClampedArrayCid: {
-      if (index.IsRegister()) {
-        __ SmiUntag(index.reg());
-      }
       if (locs()->in(2).IsConstant()) {
         const Smi& constant = Smi::Cast(locs()->in(2).constant());
         intptr_t value = constant.Value();
         // Clamp to 0x0 or 0xFF respectively.
         if (value > 0xFF) {
           value = 0xFF;
         } else if (value < 0) {
           value = 0;
         }
         __ movb(element_address,
@@ skipping 1870 matching lines @@
                          PcDescriptors::kOther,
                          locs());
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64