Additional work to get array literal allocation tracking working, even with --always-opt

src/code-stubs.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 406 matching lines @@
   int MinorKey() { return slots_; }
 };
 
 
 class FastCloneShallowArrayStub : public PlatformCodeStub {
  public:
   // Maximum length of copied elements array.
   static const int kMaximumClonedLength = 8;
   enum Mode {
     CLONE_ELEMENTS,
+    CLONE_ELEMENTS_WITH_ALLOCATION_SITE_INFO,

[mvstanton, 2013/01/11 16:56:06]

Instead, use a bitfield that combines the AllocationSiteInfoMode with the
FastCloneShallowArrayStub::Mode.

[mvstanton, 2013/01/15 15:23:15]

Done.

     CLONE_DOUBLE_ELEMENTS,
+    CLONE_DOUBLE_ELEMENTS_WITH_ALLOCATION_SITE_INFO,
     COPY_ON_WRITE_ELEMENTS,
+    COPY_ON_WRITE_ELEMENTS_WITH_ALLOCATION_SITE_INFO,
     CLONE_ANY_ELEMENTS,
     CLONE_ANY_ELEMENTS_WITH_ALLOCATION_SITE_INFO,
     LAST_CLONE_MODE = CLONE_ANY_ELEMENTS_WITH_ALLOCATION_SITE_INFO
   };
 
   static const int kFastCloneModeCount = LAST_CLONE_MODE + 1;
 
   FastCloneShallowArrayStub(Mode mode, int length)
       : mode_(mode),
         length_((mode == COPY_ON_WRITE_ELEMENTS) ? 0 : length) {
     ASSERT_GE(length_, 0);
     ASSERT_LE(length_, kMaximumClonedLength);
   }
 
   void Generate(MacroAssembler* masm);
 
+  static inline bool TrackAllocationSiteInfo(Mode mode) {

[danno, 2013/01/11 16:14:40]

nit: "Track" is a command, but you use it a query. How about
ShouldTrackAllocationSiteInfo?

[mvstanton, 2013/01/15 15:23:15]

Good point, thanks. I took Toon's advice and ended up dismantling this section.

+    return mode == CLONE_ELEMENTS_WITH_ALLOCATION_SITE_INFO ||
+        mode == CLONE_DOUBLE_ELEMENTS_WITH_ALLOCATION_SITE_INFO ||
+        mode == CLONE_ANY_ELEMENTS_WITH_ALLOCATION_SITE_INFO ||
+        mode == COPY_ON_WRITE_ELEMENTS_WITH_ALLOCATION_SITE_INFO;
+  }
+
+  static inline bool IsCloneElementsMode(Mode mode) {
+    return mode == CLONE_ELEMENTS ||
+        mode == CLONE_ELEMENTS_WITH_ALLOCATION_SITE_INFO;
+  }
+
+  static inline bool IsCloneDoubleElementsMode(Mode mode) {
+    return mode == CLONE_DOUBLE_ELEMENTS ||
+        mode == CLONE_DOUBLE_ELEMENTS_WITH_ALLOCATION_SITE_INFO;
+  }
+
+  static inline bool IsCopyOnWriteElementsMode(Mode mode) {
+    return mode == COPY_ON_WRITE_ELEMENTS ||
+        mode == COPY_ON_WRITE_ELEMENTS_WITH_ALLOCATION_SITE_INFO;
+  }
+
+  static inline bool IsCloneAnyElementsMode(Mode mode) {
+    return mode == CLONE_ANY_ELEMENTS ||
+        mode == CLONE_ANY_ELEMENTS_WITH_ALLOCATION_SITE_INFO;
+  }
+
  private:
   Mode mode_;
   int length_;
 
   Major MajorKey() { return FastCloneShallowArray; }
   int MinorKey() {
     ASSERT(mode_ >= 0 && mode_ <= LAST_CLONE_MODE);
     return length_ * kFastCloneModeCount + mode_;
   }
 };
@@ skipping 846 matching lines @@
 
   // The current function entry hook.
   static FunctionEntryHook entry_hook_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileEntryHookStub);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODE_STUBS_H_