Array index computation dehoisting.

src/ia32/lithium-ia32.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 1210 matching lines @@
     inputs_[0] = object;
   }
 
   DECLARE_CONCRETE_INSTRUCTION(LoadExternalArrayPointer,
                                "load-external-array-pointer")
 };
 
 
 class LLoadKeyedFastElement: public LTemplateInstruction<1, 2, 0> {
  public:
-  LLoadKeyedFastElement(LOperand* elements, LOperand* key) {
+  LLoadKeyedFastElement(LOperand* elements,
+                        LOperand* key,
+                        uint32_t additional_index)
+      : additional_index_(additional_index) {
     inputs_[0] = elements;
     inputs_[1] = key;
   }
 
   DECLARE_CONCRETE_INSTRUCTION(LoadKeyedFastElement, "load-keyed-fast-element")
   DECLARE_HYDROGEN_ACCESSOR(LoadKeyedFastElement)
 
   LOperand* elements() { return inputs_[0]; }
   LOperand* key() { return inputs_[1]; }
+  uint32_t additional_index() const { return additional_index_; }
+  void set_additional_index(uint32_t additional_index) {
+    additional_index_ = additional_index;
+  }
+
+ private:
+  uint32_t additional_index_;

[Jakob Kummerow, 2012/05/08 13:46:26]

You don't need to pass this value to the LInstruction. Just use the hydrogen()
accessor to fetch it from the associated HInstruction.
I think that obsoletes all of the changes to this file.

[Massi, 2012/05/14 13:48:52]

Done.

 };
 
 
 class LLoadKeyedFastDoubleElement: public LTemplateInstruction<1, 2, 0> {
  public:
   LLoadKeyedFastDoubleElement(LOperand* elements,
-                              LOperand* key) {
+                              LOperand* key,
+                              uint32_t additional_index)
+      : additional_index_(additional_index) {
     inputs_[0] = elements;
     inputs_[1] = key;
   }
 
   DECLARE_CONCRETE_INSTRUCTION(LoadKeyedFastDoubleElement,
                                "load-keyed-fast-double-element")
   DECLARE_HYDROGEN_ACCESSOR(LoadKeyedFastDoubleElement)
 
   LOperand* elements() { return inputs_[0]; }
   LOperand* key() { return inputs_[1]; }
+  uint32_t additional_index() const { return additional_index_; }
+  void set_additional_index(uint32_t additional_index) {
+    additional_index_ = additional_index;
+  }
+
+ private:
+  uint32_t additional_index_;
 };
 
 
 class LLoadKeyedSpecializedArrayElement: public LTemplateInstruction<1, 2, 0> {
  public:
   LLoadKeyedSpecializedArrayElement(LOperand* external_pointer,
-                                    LOperand* key) {
+                                    LOperand* key,
+                                    uint32_t additional_index)
+      : additional_index_(additional_index) {
     inputs_[0] = external_pointer;
     inputs_[1] = key;
   }
 
   DECLARE_CONCRETE_INSTRUCTION(LoadKeyedSpecializedArrayElement,
                                "load-keyed-specialized-array-element")
   DECLARE_HYDROGEN_ACCESSOR(LoadKeyedSpecializedArrayElement)
 
   LOperand* external_pointer() { return inputs_[0]; }
   LOperand* key() { return inputs_[1]; }
   ElementsKind elements_kind() const {
     return hydrogen()->elements_kind();
   }
+  uint32_t additional_index() const { return additional_index_; }
+  void set_additional_index(uint32_t additional_index) {
+    additional_index_ = additional_index;
+  }
+
+ private:
+  uint32_t additional_index_;
 };
 
 
 class LLoadKeyedGeneric: public LTemplateInstruction<1, 3, 0> {
  public:
   LLoadKeyedGeneric(LOperand* context, LOperand* obj, LOperand* key) {
     inputs_[0] = context;
     inputs_[1] = obj;
     inputs_[2] = key;
   }
@@ skipping 465 matching lines @@
   LOperand* context() { return inputs_[0]; }
   LOperand* object() { return inputs_[1]; }
   LOperand* value() { return inputs_[2]; }
   Handle<Object> name() const { return hydrogen()->name(); }
   StrictModeFlag strict_mode_flag() { return hydrogen()->strict_mode_flag(); }
 };
 
 
 class LStoreKeyedFastElement: public LTemplateInstruction<0, 3, 0> {
  public:
-  LStoreKeyedFastElement(LOperand* obj, LOperand* key, LOperand* val) {
+  LStoreKeyedFastElement(LOperand* obj,
+                         LOperand* key,
+                         LOperand* val,
+                         uint32_t additional_index)
+      : additional_index_(additional_index) {
     inputs_[0] = obj;
     inputs_[1] = key;
     inputs_[2] = val;
   }
 
   DECLARE_CONCRETE_INSTRUCTION(StoreKeyedFastElement,
                                "store-keyed-fast-element")
   DECLARE_HYDROGEN_ACCESSOR(StoreKeyedFastElement)
 
   virtual void PrintDataTo(StringStream* stream);
 
   LOperand* object() { return inputs_[0]; }
   LOperand* key() { return inputs_[1]; }
   LOperand* value() { return inputs_[2]; }
+  uint32_t additional_index() const { return additional_index_; }
+  void set_additional_index(uint32_t additional_index) {
+    additional_index_ = additional_index;
+  }
+
+ private:
+  uint32_t additional_index_;
 };
 
 
 class LStoreKeyedFastDoubleElement: public LTemplateInstruction<0, 3, 0> {
  public:
   LStoreKeyedFastDoubleElement(LOperand* elements,
                                LOperand* key,
-                               LOperand* val) {
+                               LOperand* val,
+                               uint32_t additional_index)
+      : additional_index_(additional_index) {
     inputs_[0] = elements;
     inputs_[1] = key;
     inputs_[2] = val;
   }
 
   DECLARE_CONCRETE_INSTRUCTION(StoreKeyedFastDoubleElement,
                                "store-keyed-fast-double-element")
   DECLARE_HYDROGEN_ACCESSOR(StoreKeyedFastDoubleElement)
 
   virtual void PrintDataTo(StringStream* stream);
 
   LOperand* elements() { return inputs_[0]; }
   LOperand* key() { return inputs_[1]; }
   LOperand* value() { return inputs_[2]; }
+  uint32_t additional_index() const { return additional_index_; }
+  void set_additional_index(uint32_t additional_index) {
+    additional_index_ = additional_index;
+  }
 
   bool NeedsCanonicalization() { return hydrogen()->NeedsCanonicalization(); }
+
+ private:
+  uint32_t additional_index_;
 };
 
 
 class LStoreKeyedSpecializedArrayElement: public LTemplateInstruction<0, 3, 0> {
  public:
   LStoreKeyedSpecializedArrayElement(LOperand* external_pointer,
                                      LOperand* key,
-                                     LOperand* val) {
+                                     LOperand* val,
+                                     uint32_t additional_index)
+      : additional_index_(additional_index) {
     inputs_[0] = external_pointer;
     inputs_[1] = key;
     inputs_[2] = val;
   }
 
   DECLARE_CONCRETE_INSTRUCTION(StoreKeyedSpecializedArrayElement,
                                "store-keyed-specialized-array-element")
   DECLARE_HYDROGEN_ACCESSOR(StoreKeyedSpecializedArrayElement)
 
   LOperand* external_pointer() { return inputs_[0]; }
   LOperand* key() { return inputs_[1]; }
   LOperand* value() { return inputs_[2]; }
   ElementsKind elements_kind() const {
     return hydrogen()->elements_kind();
   }
+  uint32_t additional_index() const { return additional_index_; }
+  void set_additional_index(uint32_t additional_index) {
+    additional_index_ = additional_index;
+  }
+
+ private:
+  uint32_t additional_index_;
 };
 
 
 class LStoreKeyedGeneric: public LTemplateInstruction<0, 4, 0> {
  public:
   LStoreKeyedGeneric(LOperand* context,
                      LOperand* object,
                      LOperand* key,
                      LOperand* value) {
     inputs_[0] = context;
@@ skipping 677 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(LChunkBuilder);
 };
 
 #undef DECLARE_HYDROGEN_ACCESSOR
 #undef DECLARE_CONCRETE_INSTRUCTION
 
 } }  // namespace v8::internal
 
 #endif  // V8_IA32_LITHIUM_IA32_H_