Fix allocation of array tables (use store barrier if needed, store values directly instead of via s…

runtime/vm/parser.h

 // 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.
 
 #ifndef VM_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
 #include "vm/ast.h"
@@ skipping 22 matching lines @@
   static const int kFirstLocalSlotIndex = -2;
 
   explicit ParsedFunction(const Function& function)
       : function_(function),
         node_sequence_(NULL),
         instantiator_(NULL),
         default_parameter_values_(Array::ZoneHandle()),
         saved_current_context_var_(NULL),
         saved_entry_context_var_(NULL),
         expression_temp_var_(NULL),
+        array_literal_var_(NULL),
         first_parameter_index_(0),
         first_stack_local_index_(0),
         num_copied_params_(0),
         num_stack_locals_(0) {
     ASSERT(function.IsZoneHandle());
   }
 
   const Function& function() const { return function_; }
 
   SequenceNode* node_sequence() const { return node_sequence_; }
@@ skipping 42 matching lines @@
   }
   void set_expression_temp_var(LocalVariable* value) {
     ASSERT(!has_expression_temp_var());
     expression_temp_var_ = value;
   }
   bool has_expression_temp_var() const {
     return expression_temp_var_ != NULL;
   }
   static LocalVariable* CreateExpressionTempVar(intptr_t token_pos);
 
+  void set_array_literal_var(LocalVariable* local) {
+    ASSERT((local != NULL) &&  (array_literal_var_ == NULL));
+    array_literal_var_ = local;
+  }
+  LocalVariable* array_literal_var() const {
+    ASSERT(array_literal_var_ != NULL);
+    return array_literal_var_;
+  }
+
+  static LocalVariable* CreateArrayLiteralVar(intptr_t token_pos);
+
   int first_parameter_index() const { return first_parameter_index_; }
   int first_stack_local_index() const { return first_stack_local_index_; }
   int num_copied_params() const { return num_copied_params_; }
   int num_stack_locals() const { return num_stack_locals_; }
 
   void AllocateVariables();
 
  private:
   const Function& function_;
   SequenceNode* node_sequence_;
   AstNode* instantiator_;
   Array& default_parameter_values_;
   LocalVariable* saved_current_context_var_;
   LocalVariable* saved_entry_context_var_;
   LocalVariable* expression_temp_var_;
+  // TODO(hausner): Remove once ArrayNode creation is removed from flow
+  // graph builder.
+  LocalVariable* array_literal_var_;
 
   int first_parameter_index_;
   int first_stack_local_index_;
   int num_copied_params_;
   int num_stack_locals_;
 
   DISALLOW_COPY_AND_ASSIGN(ParsedFunction);
 };
 
 
@@ skipping 475 matching lines @@
   void EnsureSavedCurrentContext();
   AstNode* CreateAssignmentNode(AstNode* original, AstNode* rhs);
   AstNode* InsertClosureCallNodes(AstNode* condition);
 
   ConstructorCallNode* CreateConstructorCallNode(
       intptr_t token_pos,
       const AbstractTypeArguments& type_arguments,
       const Function& constructor,
       ArgumentListNode* arguments);
 
+  LocalVariable* BuildArrayTempLocal(intptr_t token_pos);
 
   const Script& script_;
   TokenStream::Iterator tokens_iterator_;
   Token::Kind token_kind_;  // Cached token kind for current token.
   Block* current_block_;
 
   // is_top_level_ is true if parsing the "top level" of a compilation unit,
   // that is class definitions, function type aliases, global functions,
   // global variables.
   bool is_top_level_;
@@ skipping 23 matching lines @@
   // code at all points in the try block where an exit from the block is
   // done using 'return', 'break' or 'continue' statements.
   TryBlocks* try_blocks_list_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_