Chromium Code Reviews| Index: runtime/vm/compiler.cc |
| =================================================================== |
| --- runtime/vm/compiler.cc (revision 45086) |
| +++ runtime/vm/compiler.cc (working copy) |
| @@ -719,6 +719,8 @@ |
| TimerScope timer(FLAG_compiler_stats, |
| &CompilerStats::codefinalizer_timer, |
| isolate); |
| + const Array& deopt_info_array = Array::Handle( |
| + graph_compiler.FinalizeDeoptInfo(&assembler)); |
|
Vyacheslav Egorov (Google)
2015/04/13 15:31:37
Maybe add a comment that FinalizeDeoptInfo populat
Florian Schneider
2015/04/13 15:37:27
Done.
|
| const Code& code = Code::Handle( |
| Code::FinalizeCode(function, &assembler, optimized)); |
| code.set_is_optimized(optimized); |
| @@ -726,7 +728,7 @@ |
| code.set_inlined_id_to_function( |
| Array::Handle(graph_compiler.InliningIdToFunction())); |
| graph_compiler.FinalizePcDescriptors(code); |
| - graph_compiler.FinalizeDeoptInfo(code); |
| + code.set_deopt_info_array(deopt_info_array); |
| graph_compiler.FinalizeStackmaps(code); |
| graph_compiler.FinalizeVarDescriptors(code); |
| graph_compiler.FinalizeExceptionHandlers(code); |
| @@ -862,18 +864,7 @@ |
| ISL_Print("}\n"); |
| } |
| - const Array& object_table = Array::Handle(code.object_table()); |
| - if (object_table.Length() > 0) { |
| - ISL_Print("Object Table: {\n"); |
| - for (intptr_t i = 0; i < object_table.Length(); i++) { |
| - ISL_Print(" %" Pd ": %s\n", i, |
| - Object::Handle(object_table.At(i)).ToCString()); |
| - } |
| - ISL_Print("}\n"); |
| - } |
| - |
| - const Array& object_pool = Array::Handle( |
| - Instructions::Handle(code.instructions()).object_pool()); |
| + const Array& object_pool = Array::Handle(code.ObjectPool()); |
| if (object_pool.Length() > 0) { |
| ISL_Print("Object Pool: {\n"); |
| for (intptr_t i = 0; i < object_pool.Length(); i++) { |