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

Unified Diff: runtime/vm/flow_graph_compiler.cc

Issue 12049039: Fix source position for stack traces with optimized top function. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: avoid default arguments by using pending_deoptimization_env_ Created 7 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
Index: runtime/vm/flow_graph_compiler.cc
===================================================================
--- runtime/vm/flow_graph_compiler.cc (revision 17448)
+++ runtime/vm/flow_graph_compiler.cc (working copy)
@@ -152,7 +152,8 @@
may_reoptimize_(false),
double_class_(Class::ZoneHandle(
Isolate::Current()->object_store()->double_class())),
- parallel_move_resolver_(this) {
+ parallel_move_resolver_(this),
+ pending_deoptimization_env_(NULL) {
ASSERT(assembler != NULL);
}
@@ -224,8 +225,10 @@
} else {
ASSERT(instr->locs() != NULL);
EmitInstructionPrologue(instr);
+ ASSERT(pending_deoptimization_env_ == NULL);
pending_deoptimization_env_ = instr->env();
instr->EmitNativeCode(this);
+ pending_deoptimization_env_ = NULL;
EmitInstructionEpilogue(instr);
}
}
@@ -535,7 +538,7 @@
return;
}
// Emit IC call that will count and thus may need reoptimization at
- // return instruction.
+ // function entry.
ASSERT(!is_optimizing() || may_reoptimize());
switch (ic_data.num_args_tested()) {
case 1:

Powered by Google App Engine
This is Rietveld 408576698