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

Unified Diff: runtime/vm/deferred_objects.cc

Issue 183683013: Change deoptimization description for materialized objects. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/deferred_objects.h ('k') | runtime/vm/deopt_instructions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/deferred_objects.cc
===================================================================
--- runtime/vm/deferred_objects.cc (revision 33158)
+++ runtime/vm/deferred_objects.cc (working copy)
@@ -116,12 +116,21 @@
const Instance& obj = Instance::ZoneHandle(Instance::New(cls));
+ Smi& offset = Smi::Handle();
Field& field = Field::Handle();
Object& value = Object::Handle();
+ const Array& offset_map = Array::Handle(cls.OffsetToFieldMap());
+
for (intptr_t i = 0; i < field_count_; i++) {
- field ^= GetField(i);
+ offset ^= GetFieldOffset(i);
+ field ^= offset_map.At(offset.Value() / kWordSize);
value = GetValue(i);
- obj.SetField(field, value);
+ if (!field.IsNull()) {
+ obj.SetField(field, value);
+ } else {
+ ASSERT(offset.Value() == cls.type_arguments_field_offset());
+ obj.SetFieldAtOffset(offset.Value(), value);
+ }
if (FLAG_trace_deoptimization_verbose) {
OS::PrintErr(" %s <- %s\n",
« no previous file with comments | « runtime/vm/deferred_objects.h ('k') | runtime/vm/deopt_instructions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698