Use zone allocated growable array to populate interim static and stub calls table, thus allocating …

runtime/vm/flow_graph_compiler.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_FLOW_GRAPH_COMPILER_H_
 #define VM_FLOW_GRAPH_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
@@ skipping 644 matching lines @@
   }
 
 #if defined(DEBUG)
   void FrameStateUpdateWith(Instruction* instr);
   void FrameStatePush(Definition* defn);
   void FrameStatePop(intptr_t count);
   bool FrameStateIsSafeToCall();
   void FrameStateClear();
 #endif
 
+  struct StaticCallsStruct {
+    intptr_t offset;
+    const Function* function;

[koda, 2015/08/20 18:13:18]

For readability, please comment (and preferably also assert) that exactly one of
these is NULL.

[srdjan, 2015/08/20 21:37:45]

Discussed offline, adding comment.

+    const Code* code;
+    StaticCallsStruct(intptr_t offset_arg,
+                      const Function* function_arg,
+                      const Code* code_arg)
+        : offset(offset_arg), function(function_arg), code(code_arg) {}
+  };
+
   Isolate* isolate_;
   Zone* zone_;
   Assembler* assembler_;
   const ParsedFunction& parsed_function_;
   const FlowGraph& flow_graph_;
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
 #if defined(DEBUG)
   GrowableArray<Representation> frame_state_;
 #endif
 
   // Compiler specific per-block state.  Indexed by postorder block number
   // for convenience.  This is not the block's index in the block order,
   // which is reverse postorder.
   BlockEntryInstr* current_block_;
   ExceptionHandlerList* exception_handlers_list_;
   DescriptorList* pc_descriptors_list_;
   StackmapTableBuilder* stackmap_table_builder_;
   GrowableArray<BlockInfo*> block_info_;
   GrowableArray<CompilerDeoptInfo*> deopt_infos_;
   GrowableArray<SlowPathCode*> slow_path_code_;
-  // Stores: [code offset, function or null, null(code)].
   // Stores static call targets as well as stub targets.
   // TODO(srdjan): Evaluate if we should store allocation stub targets into a
   // separate table?
-  const GrowableObjectArray& static_calls_target_table_;
+  GrowableArray<StaticCallsStruct> static_calls_target_table_;
   const bool is_optimizing_;
   // Set to true if optimized code has IC calls.
   bool may_reoptimize_;
   // True while emitting intrinsic code.
   bool intrinsic_mode_;
   Label intrinsic_slow_path_label_;
 
   const Class& double_class_;
   const Class& mint_class_;
   const Class& float32x4_class_;
@@ skipping 18 matching lines @@
   Array& inlined_code_intervals_;
   const GrowableArray<const Function*>& inline_id_to_function_;
   const GrowableArray<intptr_t>& caller_inline_id_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_