Use temporary variable for StoreIndexed that returns a value.

runtime/vm/flow_graph_builder.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
@@ skipping 1902 matching lines @@
   arguments->Add(for_index.value());
   const String& name =
       String::ZoneHandle(String::NewSymbol(Token::Str(Token::kINDEX)));
   InstanceCallComp* call = new InstanceCallComp(
       node->token_index(), owner()->try_index(), name,
       arguments, Array::ZoneHandle(), 1);
   ReturnComputation(call);
 }
 
 
-void EffectGraphVisitor::VisitStoreIndexedNode(StoreIndexedNode* node) {
+void EffectGraphVisitor::BuildStoreIndexedValues(
+    StoreIndexedNode* node, Value** array, Value** index, Value** value) {
   ValueGraphVisitor for_array(owner(), temp_index());
   node->array()->Visit(&for_array);
   Append(for_array);
   ValueGraphVisitor for_index(owner(), for_array.temp_index());
   node->index_expr()->Visit(&for_index);
   Append(for_index);
   ValueGraphVisitor for_value(owner(), for_index.temp_index());
   node->value()->Visit(&for_value);
   Append(for_value);
+  *array = for_array.value();
+  *index = for_index.value();
+  *value = for_value.value();
+}
+
+
+void EffectGraphVisitor::VisitStoreIndexedNode(StoreIndexedNode* node) {
+  Value *array, *index, *value;
+  BuildStoreIndexedValues(node, &array, &index, &value);
   StoreIndexedComp* store = new StoreIndexedComp(node->token_index(),
                                                  owner()->try_index(),
-                                                 for_array.value(),
-                                                 for_index.value(),
-                                                 for_value.value());
+                                                 array,
+                                                 index,
+                                                 value);
   ReturnComputation(store);
 }
 
 
+void ValueGraphVisitor::VisitStoreIndexedNode(StoreIndexedNode* node) {
+  Value *array, *index, *value;
+  BuildStoreIndexedValues(node, &array, &index, &value);
+  BindInstr* store_local_instr = new BindInstr(
+      BuildStoreLocal(*owner()->parsed_function().expression_temp_var(),
+                      value));
+  AddInstruction(store_local_instr);
+  UseVal* saved_value = new UseVal(store_local_instr);
+  StoreIndexedComp* store = new StoreIndexedComp(node->token_index(),
+                                                 owner()->try_index(),
+                                                 array,
+                                                 index,
+                                                 saved_value);
+  AddInstruction(new DoInstr(store));
+  ReturnComputation(
+       BuildLoadLocal(*owner()->parsed_function().expression_temp_var()));
+}
+
+
 bool EffectGraphVisitor::MustSaveRestoreContext(SequenceNode* node) const {
   return (node == owner()->parsed_function().node_sequence()) &&
          (owner()->parsed_function().saved_context_var() != NULL);
 }
 
 
 void EffectGraphVisitor::UnchainContext() {
   BindInstr* context = new BindInstr(new CurrentContextComp());
   AddInstruction(context);
   BindInstr* parent =
@@ skipping 455 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart