Improve register usage for StoreInstanceField.

runtime/vm/intermediate_language_x64.cc

 // Copyright (c) 2012, 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 913 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());
   locs->set_in(1, CanBeImmediateIndex(index())
                     ? Location::RegisterOrConstant(index())
                     : Location::RequiresRegister());
-  locs->set_in(2, value()->NeedsStoreBuffer()
+  locs->set_in(2, ShouldEmitStoreBarrier()
                     ? Location::WritableRegister()
                     : Location::RegisterOrConstant(value()));
   return locs;
 }
 
 
 void StoreIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register array = locs()->in(0).reg();
 
   // Note that index is Smi, i.e, times 4.
   ASSERT(kSmiTagShift == 1);
   Location index = locs()->in(1);
   FieldAddress field_address = index.IsConstant()
       ? FieldAddress(
           array,
           static_cast<int32_t>(
             Smi::Cast(index.constant()).Value() * kWordSize + sizeof(RawArray)))
       : FieldAddress(array, index.reg(), TIMES_4, sizeof(RawArray));
 
-  if (this->value()->NeedsStoreBuffer() && emit_store_barrier()) {
+  if (ShouldEmitStoreBarrier()) {
       Register value = locs()->in(2).reg();
     __ StoreIntoObject(array, field_address, value);
   } else {
     if (locs()->in(2).IsConstant()) {
       const Object& constant = locs()->in(2).constant();
       __ StoreObject(field_address, constant);
     } else {
       Register value = locs()->in(2).reg();
       __ StoreIntoObjectNoBarrier(array, field_address, value);
     }
   }
 }
 
 
 LocationSummary* StoreInstanceFieldInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 2;
   const intptr_t num_temps = 0;
   LocationSummary* summary =
       new LocationSummary(kNumInputs, num_temps, LocationSummary::kNoCall);
   summary->set_in(0, Location::RequiresRegister());
-  summary->set_in(1,
-      value()->NeedsStoreBuffer() ? Location::WritableRegister()
-                                  : Location::RequiresRegister());
+  summary->set_in(1, ShouldEmitStoreBarrier()
+                       ? Location::WritableRegister()
+                       : Location::RegisterOrConstant(value()));
   return summary;
 }
 
 
 void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register instance_reg = locs()->in(0).reg();
-  Register value_reg = locs()->in(1).reg();
-  if (this->value()->NeedsStoreBuffer() && emit_store_barrier()) {
+  if (ShouldEmitStoreBarrier()) {
+    Register value_reg = locs()->in(1).reg();
     __ StoreIntoObject(instance_reg,
         FieldAddress(instance_reg, field().Offset()), value_reg);
   } else {
-    __ StoreIntoObjectNoBarrier(instance_reg,
-        FieldAddress(instance_reg, field().Offset()), value_reg);
+    if (locs()->in(1).IsConstant()) {
+      __ StoreObject(FieldAddress(instance_reg, field().Offset()),
+                     locs()->in(1).constant());
+    } else {
+      Register value_reg = locs()->in(1).reg();
+      __ StoreIntoObjectNoBarrier(instance_reg,
+          FieldAddress(instance_reg, field().Offset()), value_reg);
+    }
   }
 }
 
 
 LocationSummary* LoadStaticFieldInstr::MakeLocationSummary() const {
   return LocationSummary::Make(0,
                                Location::RequiresRegister(),
                                LocationSummary::kNoCall);
 }
 
@@ skipping 1286 matching lines @@
     __ j(ABOVE_EQUAL, deopt);
   }
 }
 
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64