Rollback of r15097, r15087 in trunk branch.

src/lithium.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 509 matching lines @@
                int value_count,
                LEnvironment* outer,
                HEnterInlined* entry,
                Zone* zone)
       : closure_(closure),
         frame_type_(frame_type),
         arguments_stack_height_(argument_count),
         deoptimization_index_(Safepoint::kNoDeoptimizationIndex),
         translation_index_(-1),
         ast_id_(ast_id),
-        translation_size_(value_count),
         parameter_count_(parameter_count),
         pc_offset_(-1),
         values_(value_count, zone),
         is_tagged_(value_count, zone),
         is_uint32_(value_count, zone),
         spilled_registers_(NULL),
         spilled_double_registers_(NULL),
         outer_(outer),
         entry_(entry),
         zone_(zone) { }
 
   Handle<JSFunction> closure() const { return closure_; }
   FrameType frame_type() const { return frame_type_; }
   int arguments_stack_height() const { return arguments_stack_height_; }
   int deoptimization_index() const { return deoptimization_index_; }
   int translation_index() const { return translation_index_; }
   BailoutId ast_id() const { return ast_id_; }
-  int translation_size() const { return translation_size_; }
   int parameter_count() const { return parameter_count_; }
   int pc_offset() const { return pc_offset_; }
   LOperand** spilled_registers() const { return spilled_registers_; }
   LOperand** spilled_double_registers() const {
     return spilled_double_registers_;
   }
   const ZoneList<LOperand*>* values() const { return &values_; }
   LEnvironment* outer() const { return outer_; }
   HEnterInlined* entry() { return entry_; }
-  Zone* zone() const { return zone_; }
 
   void AddValue(LOperand* operand,
                 Representation representation,
                 bool is_uint32) {
     values_.Add(operand, zone());
     if (representation.IsSmiOrTagged()) {
       ASSERT(!is_uint32);
-      is_tagged_.Add(values_.length() - 1, zone());
+      is_tagged_.Add(values_.length() - 1);
     }
 
     if (is_uint32) {
-      is_uint32_.Add(values_.length() - 1, zone());
+      is_uint32_.Add(values_.length() - 1);
     }
   }
 
   bool HasTaggedValueAt(int index) const {
     return is_tagged_.Contains(index);
   }
 
   bool HasUint32ValueAt(int index) const {
     return is_uint32_.Contains(index);
   }
@@ skipping 11 matching lines @@
   }
 
   void SetSpilledRegisters(LOperand** registers,
                            LOperand** double_registers) {
     spilled_registers_ = registers;
     spilled_double_registers_ = double_registers;
   }
 
   void PrintTo(StringStream* stream);
 
+  Zone* zone() const { return zone_; }
+
  private:
   Handle<JSFunction> closure_;
   FrameType frame_type_;
   int arguments_stack_height_;
   int deoptimization_index_;
   int translation_index_;
   BailoutId ast_id_;
-  int translation_size_;
   int parameter_count_;
   int pc_offset_;
-
-  // Value array: [parameters] [locals] [expression stack] [de-materialized].
-  //              |>--------- translation_size ---------<|
   ZoneList<LOperand*> values_;
-  GrowableBitVector is_tagged_;
-  GrowableBitVector is_uint32_;
+  BitVector is_tagged_;
+  BitVector is_uint32_;
 
   // Allocation index indexed arrays of spill slot operands for registers
   // that are also in spill slots at an OSR entry.  NULL for environments
   // that do not correspond to an OSR entry.
   LOperand** spilled_registers_;
   LOperand** spilled_double_registers_;
 
   LEnvironment* outer_;
   HEnterInlined* entry_;
+
   Zone* zone_;
 };
 
 
 // Iterates over the non-null, non-constant operands in an environment.
 class ShallowIterator BASE_EMBEDDED {
  public:
   explicit ShallowIterator(LEnvironment* env)
       : env_(env),
         limit_(env != NULL ? env->values()->length() : 0),
@@ skipping 137 matching lines @@
 enum NumberUntagDMode {
   NUMBER_CANDIDATE_IS_SMI,
   NUMBER_CANDIDATE_IS_ANY_TAGGED,
   NUMBER_CANDIDATE_IS_ANY_TAGGED_CONVERT_HOLE
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_LITHIUM_H_