Split GuardField into GuardFieldType and GuardFieldLength instructions.

runtime/vm/flow_graph_compiler.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_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/cha.h"
 #include "vm/dart_entry.h"
@@ skipping 238 matching lines @@
 }
 
 
 void FlowGraphCompiler::EmitInstructionPrologue(Instruction* instr) {
   if (!is_optimizing()) {
     if (FLAG_enable_type_checks && instr->IsAssertAssignable()) {
       AssertAssignableInstr* assert = instr->AsAssertAssignable();
       AddCurrentDescriptor(PcDescriptors::kDeopt,
                            assert->deopt_id(),
                            assert->token_pos());
-    } else if (instr->IsGuardField() ||
+    } else if (instr->IsGuardFieldClass() ||
+               instr->IsGuardFieldLength() ||

[Florian Schneider, 2014/05/28 14:57:36]

Can we just change CanBecomeDeoptimizationTarget() to return true for
GuardField?

[Vyacheslav Egorov (Google), 2014/05/29 17:36:51]

Done.

                (instr->CanBecomeDeoptimizationTarget() && !instr->IsGoto())) {
       // GuardField and instructions that can be deoptimization targets need
       // to record their deopt id.  GotoInstr records its own so that it can
       // control the placement.
       AddCurrentDescriptor(PcDescriptors::kDeopt,
                            instr->deopt_id(),
                            Scanner::kNoSourcePos);
     }
     AllocateRegistersLocally(instr);
   } else if (instr->MayThrow()  &&
@@ skipping 1028 matching lines @@
 
   for (int i = 0; i < len; i++) {
     sorted->Add(CidTarget(ic_data.GetReceiverClassIdAt(i),
                           &Function::ZoneHandle(ic_data.GetTargetAt(i)),
                           ic_data.GetCountAt(i)));
   }
   sorted->Sort(HighestCountFirst);
 }
 
 }  // namespace dart