Inline setters, getters, various cleanups & restructuring.

runtime/vm/intermediate_language.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/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/flow_graph_compiler.h"
 #include "vm/locations.h"
@@ skipping 19 matching lines @@
 Instruction* ShortName##Instr::Accept(FlowGraphVisitor* visitor) {             \
   visitor->Visit##ShortName(this);                                             \
   return StraightLineSuccessor();                                              \
 }
 
 FOR_EACH_INSTRUCTION(DEFINE_ACCEPT)
 
 #undef DEFINE_ACCEPT
 
 
+// Truee iff. the v2 is above v1 on stack, or one of them is constant.
+static bool VerifyValues(Value* v1, Value* v2) {
+  ASSERT(v1->IsUse() && v2->IsUse());
+  return (v1->AsUse()->definition()->temp_index() + 1) ==
+     v2->AsUse()->definition()->temp_index();
+}
+
+
 // Default implementation of visiting basic blocks.  Can be overridden.
 void FlowGraphVisitor::VisitBlocks() {
   for (intptr_t i = 0; i < block_order_.length(); ++i) {
     Instruction* current = block_order_[i]->Accept(this);
     while ((current != NULL) && !current->IsBlockEntry()) {
       current = current->Accept(this);
     }
   }
 }
 
@@ skipping 559 matching lines @@
     intptr_t current = val->AsUse()->definition()->temp_index();
     if (i != 0) {
       if (current != (previous + 1)) return false;
     }
     previous = current;
   }
   return true;
 }
 
 
-// Truee iff. the v2 is above v1 on stack, or one of them is constant.
-static bool VerifyValues(Value* v1, Value* v2) {
-  ASSERT(v1->IsUse() && v2->IsUse());
-  return (v1->AsUse()->definition()->temp_index() + 1) ==
-     v2->AsUse()->definition()->temp_index();
-}
-
-
 #define __ compiler->assembler()->
 
 void GraphEntryInstr::PrepareEntry(FlowGraphCompiler* compiler) {
   // Nothing to do.
 }
 
 
 void JoinEntryInstr::PrepareEntry(FlowGraphCompiler* compiler) {
   __ Bind(compiler->GetBlockLabel(this));
 }
 
 
 void TargetEntryInstr::PrepareEntry(FlowGraphCompiler* compiler) {
   __ Bind(compiler->GetBlockLabel(this));
   if (HasTryIndex()) {
     compiler->AddExceptionHandler(try_index(),
                                   compiler->assembler()->CodeSize());
   }
 }
 
 
+LocationSummary* StoreInstanceFieldComp::MakeLocationSummary() const {
+  const intptr_t kNumInputs = 2;
+  intptr_t num_temps = (class_ids() == NULL) ? 0 : 1;
+  LocationSummary* summary = new LocationSummary(kNumInputs, num_temps);
+  summary->set_in(0, Location::RequiresRegister());
+  summary->set_in(1, Location::RequiresRegister());
+  if (class_ids() != NULL) {
+    summary->set_temp(0, Location::RequiresRegister());
+  }
+  return summary;
+}
+
+
+void StoreInstanceFieldComp::EmitNativeCode(FlowGraphCompiler* compiler) {
+  ASSERT(VerifyValues(instance(), value()));
+  Register instance = locs()->in(0).reg();
+  Register value = locs()->in(1).reg();
+
+  if (class_ids() != NULL) {
+    ASSERT(original() != NULL);
+    Label* deopt = compiler->AddDeoptStub(original()->cid(),
+                                          original()->token_index(),
+                                          original()->try_index(),
+                                          kDeoptInstanceGetterSameTarget,
+                                          instance,
+                                          value);
+    // Smis do not have instance fields (Smi class is always first).
+    // Use 'result' as temporary register.

[Florian Schneider, 2012/06/07 08:47:59]

Comment seems out of date: There is no 'result' register anymore.

[srdjan, 2012/06/07 18:24:50]

Done.

+    Register temp = locs()->temp(0).reg();
+    ASSERT(temp != instance);
+    ASSERT(temp != value);
+    compiler->EmitClassChecksNoSmi(*class_ids(), instance, temp, deopt);
+  }
+  __ StoreIntoObject(instance, FieldAddress(instance, field().Offset()),
+                     value);
+}
+
+
 LocationSummary* ThrowInstr::MakeLocationSummary() const {
   const int kNumInputs = 0;
   const int kNumTemps = 0;
   return new LocationSummary(kNumInputs, kNumTemps);
 }
 
 
 
 void ThrowInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   ASSERT(exception()->IsUse());
@@ skipping 177 matching lines @@
                                      dst_name());
   ASSERT(locs()->in(0).reg() == locs()->out().reg());
 }
 
 
 LocationSummary* AssertBooleanComp::MakeLocationSummary() const {
   return LocationSummary::Make(1, Location::SameAsFirstInput());
 }
 
 
-LocationSummary* StoreInstanceFieldComp::MakeLocationSummary() const {
-  return LocationSummary::Make(2, Location::RequiresRegister());
-}
-
-
-void StoreInstanceFieldComp::EmitNativeCode(FlowGraphCompiler* compiler) {
-  ASSERT(VerifyValues(instance(), value()));
-  Register instance = locs()->in(0).reg();
-  Register value = locs()->in(1).reg();
-  Register result = locs()->out().reg();
-
-  __ StoreIntoObject(instance, FieldAddress(instance, field().Offset()),
-                     value);
-  // TODO(fschneider): Consider eliminating this move by specifying a
-  // SameAsSecondInput for the result.
-  __ MoveRegister(result, value);
-}
-
-
 LocationSummary* StoreStaticFieldComp::MakeLocationSummary() const {
   LocationSummary* locs = new LocationSummary(1, 1);
   locs->set_in(0, Location::RequiresRegister());
   locs->set_temp(0, Location::RequiresRegister());
   locs->set_out(Location::SameAsFirstInput());
   return locs;
 }
 
 
 void StoreStaticFieldComp::EmitNativeCode(FlowGraphCompiler* compiler) {
@@ skipping 86 matching lines @@
       StubCode::GetAllocationStubForClosure(closure_function));
   const ExternalLabel label(closure_function.ToCString(), stub.EntryPoint());
   compiler->GenerateCall(token_index(), try_index(), &label,
                          PcDescriptors::kOther);
   __ Drop(2);  // Discard type arguments and receiver.
 }
 
 #undef __
 
 }  // namespace dart