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

Unified Diff: runtime/vm/compiler.cc

Issue 1073173003: Eliminate object table and use regular object pool for deoptimization infos. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 8 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/assembler_x64.h ('k') | runtime/vm/deopt_instructions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/compiler.cc
===================================================================
--- runtime/vm/compiler.cc (revision 45086)
+++ runtime/vm/compiler.cc (working copy)
@@ -719,6 +719,10 @@
TimerScope timer(FLAG_compiler_stats,
&CompilerStats::codefinalizer_timer,
isolate);
+ // CreateDeoptInfo uses the object pool and needs to be done before
+ // FinalizeCode.
+ const Array& deopt_info_array = Array::Handle(
+ graph_compiler.CreateDeoptInfo(&assembler));
const Code& code = Code::Handle(
Code::FinalizeCode(function, &assembler, optimized));
code.set_is_optimized(optimized);
@@ -726,7 +730,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 +866,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++) {
« no previous file with comments | « runtime/vm/assembler_x64.h ('k') | runtime/vm/deopt_instructions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698