Split GuardField into GuardFieldType and GuardFieldLength instructions.

runtime/vm/intermediate_language.h

 // 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.
 
 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 729 matching lines @@
   M(BinaryMintOp)                                                              \
   M(ShiftMintOp)                                                               \
   M(UnaryMintOp)                                                               \
   M(CheckArrayBound)                                                           \
   M(Constraint)                                                                \
   M(StringToCharCode)                                                          \
   M(StringFromCharCode)                                                        \
   M(StringInterpolate)                                                         \
   M(InvokeMathCFunction)                                                       \
   M(MergedMath)                                                                \
-  M(GuardField)                                                                \
+  M(GuardFieldClass)                                                           \
+  M(GuardFieldLength)                                                          \
   M(IfThenElse)                                                                \
   M(BinaryFloat32x4Op)                                                         \
   M(Simd32x4Shuffle)                                                           \
   M(Simd32x4ShuffleMix)                                                        \
   M(Simd32x4GetSignMask)                                                       \
   M(Float32x4Constructor)                                                      \
   M(Float32x4Zero)                                                             \
   M(Float32x4Splat)                                                            \
   M(Float32x4Comparison)                                                       \
   M(Float32x4MinMax)                                                           \
@@ skipping 3047 matching lines @@
                   intptr_t deopt_id)
     : field_(field) {
     deopt_id_ = deopt_id;
     SetInputAt(0, value);
   }
 
   Value* value() const { return inputs_[0]; }
 
   const Field& field() const { return field_; }
 
-  DECLARE_INSTRUCTION(GuardField)
-
   virtual intptr_t ArgumentCount() const { return 0; }
 
   virtual bool CanDeoptimize() const { return true; }
-
-  virtual Instruction* Canonicalize(FlowGraph* flow_graph);
-
-  virtual void PrintOperandsTo(BufferFormatter* f) const;
+  virtual bool CanBecomeDeoptimizationTarget() const {
+    // Ensure that we record kDeopt PC descriptor in unoptimized code.
+    return true;
+  }
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
-  virtual bool AttributesEqual(Instruction* other) const;
 
   virtual bool MayThrow() const { return false; }
 
+  virtual void PrintOperandsTo(BufferFormatter* f) const;
+
  private:
   const Field& field_;
 
   DISALLOW_COPY_AND_ASSIGN(GuardFieldInstr);
 };
 
 
+class GuardFieldClassInstr : public GuardFieldInstr {
+ public:
+  GuardFieldClassInstr(Value* value,
+                       const Field& field,
+                       intptr_t deopt_id)
+    : GuardFieldInstr(value, field, deopt_id) { }
+
+  DECLARE_INSTRUCTION(GuardFieldClass)
+
+  virtual Instruction* Canonicalize(FlowGraph* flow_graph);
+
+  virtual bool AttributesEqual(Instruction* other) const;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(GuardFieldClassInstr);
+};
+
+
+class GuardFieldLengthInstr : public GuardFieldInstr {
+ public:
+  GuardFieldLengthInstr(Value* value,
+                       const Field& field,
+                       intptr_t deopt_id)
+    : GuardFieldInstr(value, field, deopt_id) { }
+
+  DECLARE_INSTRUCTION(GuardFieldLength)
+
+  virtual Instruction* Canonicalize(FlowGraph* flow_graph);
+
+  virtual bool AttributesEqual(Instruction* other) const;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(GuardFieldLengthInstr);
+};
+
+
 class LoadStaticFieldInstr : public TemplateDefinition<1> {
  public:
   explicit LoadStaticFieldInstr(Value* field_value) {
     ASSERT(field_value->BindsToConstant());
     SetInputAt(0, field_value);
   }
 
   DECLARE_INSTRUCTION(LoadStaticField)
   virtual CompileType ComputeType() const;
 
@@ skipping 4096 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_