| Index: runtime/vm/flow_graph_compiler.cc
|
| diff --git a/runtime/vm/flow_graph_compiler.cc b/runtime/vm/flow_graph_compiler.cc
|
| index 5bb8e098ba2873e0f5a3a4d6bf5e93fc4ce60fc4..73765415a5c671fe89f6382237c3a242fdcf1cad 100644
|
| --- a/runtime/vm/flow_graph_compiler.cc
|
| +++ b/runtime/vm/flow_graph_compiler.cc
|
| @@ -228,7 +228,8 @@ static bool IsEmptyBlock(BlockEntryInstr* block) {
|
| return !block->IsCatchBlockEntry() &&
|
| !block->HasNonRedundantParallelMove() &&
|
| block->next()->IsGoto() &&
|
| - !block->next()->AsGoto()->HasNonRedundantParallelMove();
|
| + !block->next()->AsGoto()->HasNonRedundantParallelMove() &&
|
| + !block->IsIndirectEntry();
|
| }
|
|
|
|
|
| @@ -355,6 +356,7 @@ void FlowGraphCompiler::VisitBlocks() {
|
|
|
| LoopInfoComment(assembler(), *entry, *loop_headers);
|
|
|
| + entry->set_offset(assembler()->CodeSize());
|
| entry->EmitNativeCode(this);
|
| // Compile all successors until an exit, branch, or a block entry.
|
| for (ForwardInstructionIterator it(entry); !it.Done(); it.Advance()) {
|
| @@ -827,6 +829,11 @@ void FlowGraphCompiler::FinalizeStackmaps(const Code& code) {
|
|
|
|
|
| void FlowGraphCompiler::FinalizeVarDescriptors(const Code& code) {
|
| + if (parsed_function().node_sequence() == NULL) {
|
| + ASSERT(flow_graph().IsIrregexpFunction());
|
| + return;
|
| + }
|
| +
|
| const LocalVarDescriptors& var_descs = LocalVarDescriptors::Handle(
|
| parsed_function_.node_sequence()->scope()->GetVarDescriptors(
|
| parsed_function_.function()));
|
|
|