Split GuardField into GuardFieldType and GuardFieldLength instructions.

runtime/vm/il_printer.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/il_printer.h"
 
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 
@@ skipping 421 matching lines @@
   value()->PrintTo(f);
 }
 
 
 void NativeCallInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s", native_name().ToCString());
 }
 
 
 void GuardFieldInstr::PrintOperandsTo(BufferFormatter* f) const {
-  const char* expected = "?";
-  if (field().guarded_cid() != kIllegalCid) {
-    const Class& cls = Class::Handle(
-            Isolate::Current()->class_table()->At(field().guarded_cid()));
-    expected = String::Handle(cls.Name()).ToCString();
-  }
-
-  f->Print("%s [%s %s], ",
+  f->Print("%s %s, ",
            String::Handle(field().name()).ToCString(),
-           field().is_nullable() ? "nullable" : "non-nullable",
-           expected);
+           field().GuardedPropertiesAsCString());
   value()->PrintTo(f);
 }
 
 
 void StoreInstanceFieldInstr::PrintOperandsTo(BufferFormatter* f) const {
   if (field().IsNull()) {
     f->Print("{%" Pd "}, ", offset_in_bytes());
   } else {
     f->Print("%s {%" Pd "}, ",
              String::Handle(field().name()).ToCString(),
@@ skipping 606 matching lines @@
 }
 
 const char* Environment::ToCString() const {
   char buffer[1024];
   BufferFormatter bf(buffer, 1024);
   PrintTo(&bf);
   return Isolate::Current()->current_zone()->MakeCopyOfString(buffer);
 }
 
 }  // namespace dart