| Index: runtime/vm/flow_graph_compiler_x64.cc
|
| ===================================================================
|
| --- runtime/vm/flow_graph_compiler_x64.cc (revision 8112)
|
| +++ runtime/vm/flow_graph_compiler_x64.cc (working copy)
|
| @@ -91,6 +91,7 @@
|
| block_info_(block_order.length()),
|
| current_block_(NULL),
|
| pc_descriptors_list_(NULL),
|
| + stackmap_builder_(NULL),
|
| exception_handlers_list_(NULL),
|
| deopt_stubs_(),
|
| is_optimizing_(is_optimizing) {
|
| @@ -1622,8 +1623,14 @@
|
|
|
|
|
| void FlowGraphCompiler::FinalizeStackmaps(const Code& code) {
|
| - // TODO(srdjan): Compute stack maps for optimizing compiler.
|
| - code.set_stackmaps(Array::Handle());
|
| + if (stackmap_builder_ == NULL) {
|
| + // The unoptimizing compiler has no stack maps.
|
| + code.set_stackmaps(Array::Handle());
|
| + } else {
|
| + // Finalize the stack map array and add it to the code object.
|
| + code.set_stackmaps(
|
| + Array::Handle(stackmap_builder_->FinalizeStackmaps(code)));
|
| + }
|
| }
|
|
|
|
|
|
|