Rebase of partial ia32 implementation of optimized try/catch (started by Kevin Millikin, continued …

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 494 matching lines @@
  private:
   ZoneList<LOperand*> pointer_operands_;
   ZoneList<LOperand*> untagged_operands_;
   int position_;
   int lithium_position_;
 };
 
 
 class LEnvironment: public ZoneObject {
  public:
-  LEnvironment(Handle<JSFunction> closure,
-               FrameType frame_type,
-               BailoutId ast_id,
-               int parameter_count,
+  LEnvironment(HEnvironment* hydrogen,  // Mutable!  Do not store.
                int argument_count,
                int value_count,
                LEnvironment* outer,
                HEnterInlined* entry,
                Zone* zone)
-      : closure_(closure),
-        frame_type_(frame_type),
+      : closure_(hydrogen->closure()),
+        frame_type_(hydrogen->frame_type()),
         arguments_stack_height_(argument_count),
+        handler_count_(hydrogen->handler_count()),
         deoptimization_index_(Safepoint::kNoDeoptimizationIndex),
         translation_index_(-1),
-        ast_id_(ast_id),
-        translation_size_(value_count),
-        parameter_count_(parameter_count),
+        ast_id_(hydrogen->ast_id()),
+        translation_size_(value_count), //FIXME(mmassi) Maybe this was "hydrogen->parameter_count()"
+        parameter_count_(hydrogen->parameter_count()),
         pc_offset_(-1),
         values_(value_count, zone),
         is_tagged_(value_count, zone),
-        is_uint32_(value_count, zone),
+        is_uint32_(hydrogen->length(), 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 handler_count() const { return handler_count_; }
   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_;
   }
@@ skipping 41 matching lines @@
     spilled_registers_ = registers;
     spilled_double_registers_ = double_registers;
   }
 
   void PrintTo(StringStream* stream);
 
  private:
   Handle<JSFunction> closure_;
   FrameType frame_type_;
   int arguments_stack_height_;
+  int handler_count_;
   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_;
@@ skipping 158 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_