Supporting AllocationSiteInfo for Nested arrays

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 5128 matching lines @@
   int literal_index_;
   int depth_;
   AllocationSiteMode allocation_site_mode_;
 };
 
 
 class HFastLiteral: public HMaterializedLiteral<1> {
  public:
   HFastLiteral(HValue* context,
                Handle<JSObject> boilerplate,
+               Handle<JSObject> original_boilerplate,
                int total_size,
                int literal_index,
                int depth,
                AllocationSiteMode mode)
       : HMaterializedLiteral<1>(literal_index, depth, mode),
         boilerplate_(boilerplate),
+        original_boilerplate_(original_boilerplate),
         total_size_(total_size) {
+    ASSERT(!boilerplate.is_identical_to(original_boilerplate));
     SetOperandAt(0, context);
     SetGVNFlag(kChangesNewSpacePromotion);
   }
 
   // Maximum depth and total number of elements and properties for literal
   // graphs to be considered for fast deep-copying.
   static const int kMaxLiteralDepth = 3;
   static const int kMaxLiteralProperties = 8;
 
   HValue* context() { return OperandAt(0); }
   Handle<JSObject> boilerplate() const { return boilerplate_; }
+  Handle<JSObject> original_boilerplate() const {
+    return original_boilerplate_; }

[danno, 2013/02/08 13:44:38]

nit: } should be on next line

[mvstanton, 2013/02/11 11:11:24]

Done.

   int total_size() const { return total_size_; }
   virtual Representation RequiredInputRepresentation(int index) {
     return Representation::Tagged();
   }
   virtual Handle<Map> GetMonomorphicJSObjectMap() {
     return Handle<Map>(boilerplate()->map());
   }
   virtual HType CalculateInferredType();
 
   DECLARE_CONCRETE_INSTRUCTION(FastLiteral)
 
  private:
   Handle<JSObject> boilerplate_;
+  Handle<JSObject> original_boilerplate_;
   int total_size_;
 };
 
 
 class HArrayLiteral: public HMaterializedLiteral<1> {
  public:
   HArrayLiteral(HValue* context,
                 Handle<HeapObject> boilerplate_object,
                 int length,
                 int literal_index,
@@ skipping 30 matching lines @@
 };
 
 
 class HObjectLiteral: public HMaterializedLiteral<1> {
  public:
   HObjectLiteral(HValue* context,
                  Handle<FixedArray> constant_properties,
                  bool fast_elements,
                  int literal_index,
                  int depth,
-                 bool has_function)
-      : HMaterializedLiteral<1>(literal_index, depth),
+                 bool has_function,
+                 AllocationSiteMode mode)
+      : HMaterializedLiteral<1>(literal_index, depth, mode),
         constant_properties_(constant_properties),
         fast_elements_(fast_elements),
         has_function_(has_function) {
     SetOperandAt(0, context);
     SetGVNFlag(kChangesNewSpacePromotion);
   }
 
   HValue* context() { return OperandAt(0); }
   Handle<FixedArray> constant_properties() const {
     return constant_properties_;
@@ skipping 367 matching lines @@
   virtual bool IsDeletable() const { return true; }
 };
 
 
 #undef DECLARE_INSTRUCTION
 #undef DECLARE_CONCRETE_INSTRUCTION
 
 } }  // namespace v8::internal
 
 #endif  // V8_HYDROGEN_INSTRUCTIONS_H_