| Index: runtime/vm/disassembler_ia32.cc
|
| ===================================================================
|
| --- runtime/vm/disassembler_ia32.cc (revision 16802)
|
| +++ runtime/vm/disassembler_ia32.cc (working copy)
|
| @@ -410,7 +410,7 @@
|
| return obj.ToCString();
|
| }
|
|
|
| - const Class& clazz = Class::CheckedHandle(obj.clazz());
|
| + const Class& clazz = Class::Handle(obj.clazz());
|
| const char* full_class_name = clazz.ToCString();
|
| const char* format = "instance of %s";
|
| intptr_t len = OS::SNPrint(NULL, 0, format, full_class_name) + 1;
|
| @@ -429,17 +429,18 @@
|
| if (((addr & kSmiTagMask) == kHeapObjectTag) &&
|
| !Isolate::Current()->heap()->CodeContains(addr) &&
|
| Isolate::Current()->heap()->Contains(addr - kHeapObjectTag)) {
|
| - Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr));
|
| + const Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr));
|
| if (obj.IsArray()) {
|
| - const Array& arr = Array::CheckedHandle(obj.raw());
|
| + const Array& arr = Array::Cast(obj);
|
| intptr_t len = arr.Length();
|
| if (len > 5) len = 5; // Print a max of 5 elements.
|
| Print(" Array[");
|
| int i = 0;
|
| + Object& element = Object::Handle();
|
| while (i < len) {
|
| - obj = arr.At(i);
|
| + element = arr.At(i);
|
| if (i > 0) Print(", ");
|
| - Print(ObjectToCStringNoGC(obj));
|
| + Print(ObjectToCStringNoGC(element));
|
| i++;
|
| }
|
| if (i < arr.Length()) Print(", ...");
|
| @@ -1688,8 +1689,9 @@
|
| const intptr_t offset = pc - start;
|
| while (comment_finger < comments.Length() &&
|
| comments.PCOffsetAt(comment_finger) <= offset) {
|
| - formatter->Print(" ;; %s\n",
|
| - comments.CommentAt(comment_finger).ToCString());
|
| + formatter->Print(
|
| + " ;; %s\n",
|
| + String::Handle(comments.CommentAt(comment_finger)).ToCString());
|
| comment_finger++;
|
| }
|
| int instruction_length = DecodeInstruction(hex_buffer,
|
|
|