Fix for issues 6080 - pass in the Isolate's top context into the stub for invoking dart code from n…

runtime/vm/flow_graph_builder.cc

Index: runtime/vm/flow_graph_builder.cc
===================================================================
--- runtime/vm/flow_graph_builder.cc	(revision 18232)
+++ runtime/vm/flow_graph_builder.cc	(working copy)
@@ -1870,7 +1870,8 @@
   BuildPushArguments(*node->arguments(), arguments);
 
   // Save context around the call.
-  BuildStoreContext(*owner()->parsed_function().expression_temp_var());
+  ASSERT(owner()->parsed_function().saved_current_context_var() != NULL);
+  BuildStoreContext(*owner()->parsed_function().saved_current_context_var());
   return new ClosureCallInstr(node, arguments);
 }
 
@@ -1878,14 +1879,16 @@
 void EffectGraphVisitor::VisitClosureCallNode(ClosureCallNode* node) {
   Do(BuildClosureCall(node));
   // Restore context from saved location.
-  BuildLoadContext(*owner()->parsed_function().expression_temp_var());
+  ASSERT(owner()->parsed_function().saved_current_context_var() != NULL);
+  BuildLoadContext(*owner()->parsed_function().saved_current_context_var());
 }
 
 
 void ValueGraphVisitor::VisitClosureCallNode(ClosureCallNode* node) {
   Value* result = Bind(BuildClosureCall(node));
   // Restore context from temp.
-  BuildLoadContext(*owner()->parsed_function().expression_temp_var());
+  ASSERT(owner()->parsed_function().saved_current_context_var() != NULL);
+  BuildLoadContext(*owner()->parsed_function().saved_current_context_var());
   ReturnValue(result);
 }