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

Unified Diff: runtime/vm/flow_graph_inliner.cc

Issue 179443004: VM: Replace StoreVMField with StoreInstanceField. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 10 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_builder.cc ('k') | runtime/vm/flow_graph_optimizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_inliner.cc
===================================================================
--- runtime/vm/flow_graph_inliner.cc (revision 33058)
+++ runtime/vm/flow_graph_inliner.cc (working copy)
@@ -675,15 +675,18 @@
// TODO(fschneider): Avoid setting the context, if not needed.
Definition* closure =
closure_call->PushArgumentAt(0)->value()->definition();
- LoadFieldInstr* context =
- new LoadFieldInstr(new Value(closure),
- Closure::context_offset(),
- Type::ZoneHandle());
AllocateObjectInstr* alloc =
closure_call->ArgumentAt(0)->AsAllocateObject();
+ Definition* context = NULL;
if ((alloc != NULL) && !alloc->closure_function().IsNull()) {
ASSERT(!alloc->context_field().IsNull());
- context->set_field(&alloc->context_field());
+ context = new LoadFieldInstr(new Value(closure),
+ &alloc->context_field(),
+ Type::ZoneHandle());
+ } else {
+ context = new LoadFieldInstr(new Value(closure),
+ Closure::context_offset(),
+ Type::ZoneHandle());
}
context->set_ssa_temp_index(caller_graph()->alloc_ssa_temp_index());
« no previous file with comments | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/flow_graph_optimizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698