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

Unified Diff: runtime/vm/flow_graph_compiler.cc

Issue 1314143002: VM: Don't depend on unoptimized code when inlining and creating deoptimization info. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: addressed comments Created 5 years, 4 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 | « no previous file | runtime/vm/flow_graph_compiler_arm.cc » ('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 ab586c9fb5834f2acecbb0fb130f4e56963ed741..f2ea9ef263510cf5531b116557c458bc5f0bc4e1 100644
--- a/runtime/vm/flow_graph_compiler.cc
+++ b/runtime/vm/flow_graph_compiler.cc
@@ -389,15 +389,16 @@ void FlowGraphCompiler::EmitSourceLine(Instruction* instr) {
if ((instr->token_pos() == Scanner::kNoSourcePos) || (instr->env() == NULL)) {
return;
}
- const Function& function =
- Function::Handle(instr->env()->code().function());
- const Script& s = Script::Handle(function.script());
+ const Script& script =
+ Script::Handle(zone(), instr->env()->function().script());
intptr_t line_nr;
intptr_t column_nr;
- s.GetTokenLocation(instr->token_pos(), &line_nr, &column_nr);
- const String& line = String::Handle(s.GetLine(line_nr));
+ script.GetTokenLocation(instr->token_pos(), &line_nr, &column_nr);
+ const String& line = String::Handle(zone(), script.GetLine(line_nr));
assembler()->Comment("Line %" Pd " in '%s':\n %s",
- line_nr, function.ToFullyQualifiedCString(), line.ToCString());
+ line_nr,
+ instr->env()->function().ToFullyQualifiedCString(),
+ line.ToCString());
}
« no previous file with comments | « no previous file | runtime/vm/flow_graph_compiler_arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698