Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: runtime/vm/deferred_objects.cc

Issue 658773002: Fix crash with --trace-deoptimization-verbose and tweak formatting. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | runtime/vm/deopt_instructions.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/deferred_objects.h" 5 #include "vm/deferred_objects.h"
6 6
7 #include "vm/deopt_instructions.h" 7 #include "vm/deopt_instructions.h"
8 #include "vm/flags.h" 8 #include "vm/flags.h"
9 #include "vm/object.h" 9 #include "vm/object.h"
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 OS::PrintErr("materializing Int32x4 at %" Px ": %x,%x,%x,%x\n", 81 OS::PrintErr("materializing Int32x4 at %" Px ": %x,%x,%x,%x\n",
82 reinterpret_cast<uword>(slot()), x, y, z, w); 82 reinterpret_cast<uword>(slot()), x, y, z, w);
83 } 83 }
84 } 84 }
85 85
86 86
87 void DeferredObjectRef::Materialize(DeoptContext* deopt_context) { 87 void DeferredObjectRef::Materialize(DeoptContext* deopt_context) {
88 DeferredObject* obj = deopt_context->GetDeferredObject(index()); 88 DeferredObject* obj = deopt_context->GetDeferredObject(index());
89 *slot() = obj->object(); 89 *slot() = obj->object();
90 if (FLAG_trace_deoptimization_verbose) { 90 if (FLAG_trace_deoptimization_verbose) {
91 OS::PrintErr("writing instance ref at %" Px ": %s\n", 91 const Class& cls = Class::Handle(Isolate::Current()->class_table()->At(
92 reinterpret_cast<uword>(slot()), 92 Object::Handle(obj->object()).GetClassId()));
93 Instance::Handle(obj->object()).ToCString()); 93 OS::PrintErr("writing instance of class %s ref at %" Px ".\n",
94 cls.ToCString(),
95 reinterpret_cast<uword>(slot()));
94 } 96 }
95 } 97 }
96 98
97 99
98 RawInstance* DeferredObject::object() { 100 RawInstance* DeferredObject::object() {
99 if (object_ == NULL) { 101 if (object_ == NULL) {
100 Create(); 102 Create();
101 } 103 }
102 return object_->raw(); 104 return object_->raw();
103 } 105 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 if (FLAG_trace_deoptimization_verbose) { 155 if (FLAG_trace_deoptimization_verbose) {
154 OS::PrintErr(" null Field @ offset(%" Pd ") <- %s\n", 156 OS::PrintErr(" null Field @ offset(%" Pd ") <- %s\n",
155 offset.Value(), 157 offset.Value(),
156 value.ToCString()); 158 value.ToCString());
157 } 159 }
158 } 160 }
159 } 161 }
160 } 162 }
161 163
162 } // namespace dart 164 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/deopt_instructions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698