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

Unified Diff: runtime/vm/flow_graph_compiler.cc

Issue 539153002: Port and integrate the irregexp engine from V8 (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Addressed Ivan's comments. Created 6 years, 2 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/flow_graph.h ('k') | runtime/vm/flow_graph_optimizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler.cc
diff --git a/runtime/vm/flow_graph_compiler.cc b/runtime/vm/flow_graph_compiler.cc
index 0286145f41f1e9ccf859cd4f3a93b92ac2ea353a..da35c1bd77151b325f98ede64a50969d984c007c 100644
--- a/runtime/vm/flow_graph_compiler.cc
+++ b/runtime/vm/flow_graph_compiler.cc
@@ -227,7 +227,8 @@ bool FlowGraphCompiler::ForceSlowPathForStackOverflow() const {
static bool IsEmptyBlock(BlockEntryInstr* block) {
return !block->HasParallelMove() &&
block->next()->IsGoto() &&
- !block->next()->AsGoto()->HasParallelMove();
+ !block->next()->AsGoto()->HasParallelMove() &&
+ !block->IsIndirectEntry();
}
@@ -354,6 +355,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()) {
@@ -822,6 +824,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()));
« no previous file with comments | « runtime/vm/flow_graph.h ('k') | runtime/vm/flow_graph_optimizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698