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

Unified Diff: runtime/vm/flow_graph_builder.cc

Issue 149603003: Fix stack height assertion code and free up a bit in the Function tag bits. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 11 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/ast.h ('k') | runtime/vm/flow_graph_compiler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_builder.cc
===================================================================
--- runtime/vm/flow_graph_builder.cc (revision 32017)
+++ runtime/vm/flow_graph_builder.cc (working copy)
@@ -590,7 +590,7 @@
} else {
exit()->Goto(join);
}
- exit_ = NULL;
+ CloseFragment();
}
@@ -949,16 +949,21 @@
ValueGraphVisitor for_value(owner());
node->value()->Visit(&for_value);
Append(for_value);
+ Value* return_value = for_value.value();
- for (intptr_t i = 0; i < node->inlined_finally_list_length(); i++) {
- InlineBailout("EffectGraphVisitor::VisitReturnNode (exception)");
- EffectGraphVisitor for_effect(owner());
- node->InlinedFinallyNodeAt(i)->Visit(&for_effect);
- Append(for_effect);
- if (!is_open()) {
- owner()->DeallocateTemps(owner()->temp_count());
- return;
+ if (node->inlined_finally_list_length() > 0) {
+ LocalVariable* temp = node->saved_return_value_var();
+ Do(BuildStoreLocal(*temp, return_value, kResultNotNeeded));
+ for (intptr_t i = 0; i < node->inlined_finally_list_length(); i++) {
+ InlineBailout("EffectGraphVisitor::VisitReturnNode (exception)");
+ EffectGraphVisitor for_effect(owner());
+ node->InlinedFinallyNodeAt(i)->Visit(&for_effect);
+ Append(for_effect);
+ if (!is_open()) {
+ return;
+ }
}
+ return_value = Bind(BuildLoadLocal(*temp));
}
// Call to stub that checks whether the debugger is in single
@@ -973,7 +978,6 @@
PcDescriptors::kReturn));
}
- Value* return_value = for_value.value();
if (FLAG_enable_type_checks) {
const bool is_implicit_dynamic_getter =
(!function.is_static() &&
« no previous file with comments | « runtime/vm/ast.h ('k') | runtime/vm/flow_graph_compiler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698