A change in the way we place TransitionElementKinds in the tree.

src/hydrogen-instructions.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 2238 matching lines @@
   }
 
   virtual Representation RequiredInputRepresentation(int index) {
     return Representation::Tagged();
   }
 
   virtual void PrintDataTo(StringStream* stream);
   virtual HType CalculateInferredType();
 
   HValue* value() { return OperandAt(0); }
+  bool HasTypeCheck() const { return OperandAt(0) != OperandAt(1); }
+  void RemoveTypeCheck() { SetOperandAt(1, OperandAt(0)); }
   SmallMapList* map_set() { return &map_set_; }
 
   DECLARE_CONCRETE_INSTRUCTION(CheckMaps)
 
  protected:
   virtual bool DataEquals(HValue* other) {
     HCheckMaps* b = HCheckMaps::cast(other);
     // Relies on the fact that map_set has been sorted before.
     if (map_set()->length() != b->map_set()->length()) return false;
     for (int i = 0; i < map_set()->length(); i++) {
@@ skipping 2057 matching lines @@
   virtual bool DataEquals(HValue* other) { return true; }
 };
 
 class ArrayInstructionInterface {
  public:
   virtual HValue* GetKey() = 0;
   virtual void SetKey(HValue* key) = 0;
   virtual void SetIndexOffset(uint32_t index_offset) = 0;
   virtual bool IsDehoisted() = 0;
   virtual void SetDehoisted(bool is_dehoisted) = 0;
+  virtual void PerformDeferredInitialization(
+      ElementsKind new_elements_kind) = 0;
   virtual ~ArrayInstructionInterface() { };
 };
 
 
 class HLoadKeyed
     : public HTemplateInstruction<3>, public ArrayInstructionInterface {
  public:
   HLoadKeyed(HValue* obj,
              HValue* key,
              HValue* dependency,
-             ElementsKind elements_kind)
+             ElementsKind elements_kind,
+             bool defer_initialization = false)
       : bit_field_(0) {
     bit_field_ = ElementsKindField::encode(elements_kind);
 
+#ifdef DEBUG
+    initialized_ = !defer_initialization;

[danno, 2012/11/28 14:42:10]

Make this transparent with a single macro in ArrayInterface? e.g like in CL
10701054 AstVisitor in ast.h

[mvstanton, 2012/12/04 11:39:58]

Done.

+
+    // Deferred initialization should only be invoked for fast elements
+    // that are not external.
+    ASSERT(!(defer_initialization && is_external()));
+#endif
+
     SetOperandAt(0, obj);
     SetOperandAt(1, key);
     SetOperandAt(2, dependency);
 
-    if (!is_external()) {
+    if (is_external()) {
+      if (elements_kind == EXTERNAL_FLOAT_ELEMENTS ||
+          elements_kind == EXTERNAL_DOUBLE_ELEMENTS) {
+        set_representation(Representation::Double());
+      } else {
+        set_representation(Representation::Integer32());
+      }
+
+      SetGVNFlag(kDependsOnSpecializedArrayElements);
+      // Native code could change the specialized array.
+      SetGVNFlag(kDependsOnCalls);
+    } else if (defer_initialization) {
+      ASSERT(IsFastSmiOrObjectElementsKind(elements_kind) ||
+             IsFastDoubleElementsKind(elements_kind));
+
+      // We don't yet know what it depends on yet, so set both flags
+      SetGVNFlag(kDependsOnArrayElements);
+      SetGVNFlag(kDependsOnDoubleArrayElements);
+    } else {
       // I can detect the case between storing double (holey and fast) and
       // smi/object by looking at elements_kind_.
       ASSERT(IsFastSmiOrObjectElementsKind(elements_kind) ||
              IsFastDoubleElementsKind(elements_kind));
 
       if (IsFastSmiOrObjectElementsKind(elements_kind)) {
         if (IsFastSmiElementsKind(elements_kind) &&
             IsFastPackedElementsKind(elements_kind)) {
           set_type(HType::Smi());
         }
 
         set_representation(Representation::Tagged());
         SetGVNFlag(kDependsOnArrayElements);
       } else {
         set_representation(Representation::Double());
         SetGVNFlag(kDependsOnDoubleArrayElements);
       }
-    } else {
-      if (elements_kind == EXTERNAL_FLOAT_ELEMENTS ||
-          elements_kind == EXTERNAL_DOUBLE_ELEMENTS) {
-        set_representation(Representation::Double());
-      } else {
-        set_representation(Representation::Integer32());
-      }
-
-      SetGVNFlag(kDependsOnSpecializedArrayElements);
-      // Native code could change the specialized array.
-      SetGVNFlag(kDependsOnCalls);
     }
 
     SetFlag(kUseGVN);
   }
 
+#ifdef DEBUG
+  bool Initialized() const { return initialized_; }
+#endif
+
+  void PerformDeferredInitialization(ElementsKind new_elements_kind) {

[danno, 2012/11/28 14:42:10]

Put this in the .cc

[mvstanton, 2012/12/04 11:39:58]

Done.

+#ifdef DEBUG
+    ASSERT(!initialized_);
+    initialized_ = true;
+#endif
+    if (new_elements_kind != elements_kind()) {
+      bit_field_ = ElementsKindField::encode(new_elements_kind);
+    }
+
+    // Start fresh
+    ClearGVNFlag(kDependsOnArrayElements);
+    ClearGVNFlag(kDependsOnDoubleArrayElements);
+
+    if (IsFastSmiOrObjectElementsKind(elements_kind())) {
+      if (IsFastSmiElementsKind(elements_kind()) &&
+          IsFastPackedElementsKind(elements_kind())) {
+        set_type(HType::Smi());
+      }
+
+      set_representation(Representation::Tagged());
+      SetGVNFlag(kDependsOnArrayElements);
+    } else {
+      set_representation(Representation::Double());
+      SetGVNFlag(kDependsOnDoubleArrayElements);
+    }
+  }
+
   bool is_external() const {
     return IsExternalArrayElementsKind(elements_kind());
   }
   HValue* elements() { return OperandAt(0); }
   HValue* key() { return OperandAt(1); }
   HValue* dependency() { return OperandAt(2); }
   uint32_t index_offset() { return IndexOffsetField::decode(bit_field_); }
   void SetIndexOffset(uint32_t index_offset) {
     bit_field_ = IndexOffsetField::update(bit_field_, index_offset);
   }
   HValue* GetKey() { return key(); }
   void SetKey(HValue* key) { SetOperandAt(1, key); }
   bool IsDehoisted() { return IsDehoistedField::decode(bit_field_); }
   void SetDehoisted(bool is_dehoisted) {
     bit_field_ = IsDehoistedField::update(bit_field_, is_dehoisted);
   }
   ElementsKind elements_kind() const {
     return ElementsKindField::decode(bit_field_);
   }
 
   virtual Representation RequiredInputRepresentation(int index) {
+#ifdef DEBUG
+    // The idea here is that nobody should be inquiring about input
+    // representation until we've finished a possibly deferred initialization
+    ASSERT(initialized_);
+#endif
     // kind_fast:       tagged[int32] (none)
     // kind_double:     tagged[int32] (none)
     // kind_external: external[int32] (none)
     if (index == 0) {
       return is_external() ? Representation::External()
           : Representation::Tagged();
     }
     if (index == 1) return Representation::Integer32();
     return Representation::None();
   }
@@ skipping 42 matching lines @@
   class ElementsKindField:
     public BitField<ElementsKind, kStartElementsKind, kBitsForElementsKind>
     {};  // NOLINT
   class IndexOffsetField:
     public BitField<uint32_t, kStartIndexOffset, kBitsForIndexOffset>
     {};  // NOLINT
   class IsDehoistedField:
     public BitField<bool, kStartIsDehoisted, kBitsForIsDehoisted>
     {};  // NOLINT
   uint32_t bit_field_;
+#ifdef DEBUG
+  bool initialized_;
+#endif
 };
 
 
 class HLoadKeyedGeneric: public HTemplateInstruction<3> {
  public:
   HLoadKeyedGeneric(HValue* context, HValue* obj, HValue* key) {
     set_representation(Representation::Tagged());
     SetOperandAt(0, obj);
     SetOperandAt(1, key);
     SetOperandAt(2, context);
@@ skipping 110 matching lines @@
  private:
   Handle<String> name_;
   StrictModeFlag strict_mode_flag_;
 };
 
 
 class HStoreKeyed
     : public HTemplateInstruction<3>, public ArrayInstructionInterface {
  public:
   HStoreKeyed(HValue* obj, HValue* key, HValue* val,
-              ElementsKind elements_kind)
+              ElementsKind elements_kind,
+              bool defer_initialization = false)

[danno, 2012/11/28 14:42:10]

can you not have to care whether this is deferred, i.e. always to initialization
in a deferred way and visit the "bookmark" sites later?

[mvstanton, 2012/12/04 11:39:58]

That didn't work because there are protections around several of the flags that
prevent them being set more than once. I figured I should respect that. Though I
did make things a bit cleaner with HArrayInstruction, I think.

       : elements_kind_(elements_kind), index_offset_(0), is_dehoisted_(false) {
     SetOperandAt(0, obj);
     SetOperandAt(1, key);
     SetOperandAt(2, val);
 
+#ifdef DEBUG
+    initialized_ = !defer_initialization;
+
+    // Deferred initialization should only be invoked for fast elements
+    // that are not external.
+    ASSERT(!(defer_initialization && is_external()));
+#endif
+
     if (is_external()) {
       SetGVNFlag(kChangesSpecializedArrayElements);
+      // EXTERNAL_{UNSIGNED_,}{BYTE,SHORT,INT}_ELEMENTS are truncating.
+      if (elements_kind >= EXTERNAL_BYTE_ELEMENTS &&
+          elements_kind <= EXTERNAL_UNSIGNED_INT_ELEMENTS) {
+        SetFlag(kTruncatingToInt32);
+      }
+    } else if (defer_initialization) {
+      // We don't know what we'll have later.
+      // Initialize for the worst case
+      SetGVNFlag(kChangesDoubleArrayElements);
+      SetFlag(kDeoptimizeOnUndefined);
+      SetGVNFlag(kChangesArrayElements);
     } else if (IsFastDoubleElementsKind(elements_kind)) {
       SetGVNFlag(kChangesDoubleArrayElements);
       SetFlag(kDeoptimizeOnUndefined);
     } else {
       SetGVNFlag(kChangesArrayElements);
     }
+  }
 
-    // EXTERNAL_{UNSIGNED_,}{BYTE,SHORT,INT}_ELEMENTS are truncating.
-    if (elements_kind >= EXTERNAL_BYTE_ELEMENTS &&
-        elements_kind <= EXTERNAL_UNSIGNED_INT_ELEMENTS) {
-      SetFlag(kTruncatingToInt32);
+#ifdef DEBUG
+  bool Initialized() const { return initialized_; }
+#endif
+
+  void PerformDeferredInitialization(ElementsKind new_elements_kind) {
+#ifdef DEBUG
+    ASSERT(!initialized_);
+    initialized_ = true;
+#endif
+    if (new_elements_kind != elements_kind_) {
+      elements_kind_ = new_elements_kind;
+    }
+
+    // Adjust flags appropriately
+    if (IsFastDoubleElementsKind(elements_kind())) {
+      ClearGVNFlag(kChangesArrayElements);
+    } else {
+      ClearGVNFlag(kChangesDoubleArrayElements);
+      ClearFlag(kDeoptimizeOnUndefined);
     }
   }
 
   virtual Representation RequiredInputRepresentation(int index) {
+    ASSERT(initialized_);
     // kind_fast:       tagged[int32] = tagged
     // kind_double:     tagged[int32] = double
     // kind_external: external[int32] = (double | int32)
     if (index == 0) {
       return is_external() ? Representation::External()
                            : Representation::Tagged();
     } else if (index == 1) {
       return Representation::Integer32();
     }
 
@@ skipping 38 matching lines @@
 
   bool NeedsWriteBarrier() {
     if (value_is_smi()) {
       return false;
     } else {
       return StoringValueNeedsWriteBarrier(value());
     }
   }
 
   bool NeedsCanonicalization();
-
   virtual void PrintDataTo(StringStream* stream);
 
   DECLARE_CONCRETE_INSTRUCTION(StoreKeyed)
 
  private:
   ElementsKind elements_kind_;
   uint32_t index_offset_;
   bool is_dehoisted_;
+#ifdef DEBUG
+  bool initialized_;
+#endif
 };
 
 
 class HStoreKeyedGeneric: public HTemplateInstruction<4> {
  public:
   HStoreKeyedGeneric(HValue* context,
                      HValue* object,
                      HValue* key,
                      HValue* value,
                      StrictModeFlag strict_mode_flag)
@@ skipping 685 matching lines @@
   virtual bool IsDeletable() const { return true; }
 };
 
 
 #undef DECLARE_INSTRUCTION
 #undef DECLARE_CONCRETE_INSTRUCTION
 
 } }  // namespace v8::internal
 
 #endif  // V8_HYDROGEN_INSTRUCTIONS_H_