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

Unified Diff: runtime/vm/flow_graph.cc

Issue 298913007: Use isolate when allocation Zone objects and handles: focus on FlowGraphOptimizer, next inliner. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 7 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_builder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph.cc
===================================================================
--- runtime/vm/flow_graph.cc (revision 36573)
+++ runtime/vm/flow_graph.cc (working copy)
@@ -21,7 +21,8 @@
FlowGraph::FlowGraph(const FlowGraphBuilder& builder,
GraphEntryInstr* graph_entry,
intptr_t max_block_id)
- : parent_(),
+ : isolate_(Isolate::Current()),
+ parent_(),
current_ssa_temp_index_(0),
max_block_id_(max_block_id),
builder_(builder),
@@ -119,7 +120,7 @@
}
instr->InsertAfter(prev);
ASSERT(instr->env() == NULL);
- if (env != NULL) env->DeepCopyTo(instr);
+ if (env != NULL) env->DeepCopyTo(isolate(), instr);
}
@@ -132,7 +133,7 @@
AllocateSSAIndexes(instr->AsDefinition());
}
ASSERT(instr->env() == NULL);
- if (env != NULL) env->DeepCopyTo(instr);
+ if (env != NULL) env->DeepCopyTo(isolate(), instr);
return prev->AppendInstruction(instr);
}
@@ -754,7 +755,8 @@
void FlowGraph::AttachEnvironment(Instruction* instr,
GrowableArray<Definition*>* env) {
Environment* deopt_env =
- Environment::From(*env,
+ Environment::From(isolate(),
+ *env,
num_non_copied_params_,
Code::Handle(parsed_function_.code()));
// TODO(fschneider): Add predicates CanEagerlyDeoptimize and
@@ -764,7 +766,8 @@
// also don't have an eager deoptimziation point, so the environment attached
// here is only used for after the call.
if (instr->IsClosureCall()) {
- deopt_env = deopt_env->DeepCopy(deopt_env->Length() - instr->InputCount());
+ deopt_env = deopt_env->DeepCopy(isolate(),
+ deopt_env->Length() - instr->InputCount());
}
instr->SetEnvironment(deopt_env);
for (Environment::DeepIterator it(deopt_env); !it.Done(); it.Advance()) {
« no previous file with comments | « runtime/vm/flow_graph.h ('k') | runtime/vm/flow_graph_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698