Allow FastCloneShallowObjectStub to use AllocationMementos.

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 655 matching lines @@
         | LengthBits::encode(length_);
   }
 };
 
 
 class FastCloneShallowObjectStub : public HydrogenCodeStub {
  public:
   // Maximum number of properties in copied object.
   static const int kMaximumClonedProperties = 6;
 
-  explicit FastCloneShallowObjectStub(int length)
-      : length_(length) {
+  FastCloneShallowObjectStub(AllocationSiteMode allocation_site_mode,

[Michael Starzinger, 2013/10/10 13:27:39]

As discussed offline: I don't think it makes much sense to keep the
allocation_site as part of the minor key because it's value is statically
chosen. I don't (yet) see a use-case where we need more that one stub per
length. Let's drop that and decide whether to tack allocations when we compile
the stub.

[mvstanton, 2013/10/10 14:09:04]

Good comment, I added FLAG_allocation_site_pretenuring to express this,
currently turned off.

+                             int length)
+      : allocation_site_mode_(allocation_site_mode),
+        length_(length) {
     ASSERT_GE(length_, 0);
     ASSERT_LE(length_, kMaximumClonedProperties);
   }
 
   int length() const { return length_; }
+  AllocationSiteMode allocation_site_mode() const {
+    return allocation_site_mode_;
+  }
 
   virtual Handle<Code> GenerateCode(Isolate* isolate);
 
   virtual void InitializeInterfaceDescriptor(
       Isolate* isolate,
       CodeStubInterfaceDescriptor* descriptor);
 
  private:
+  AllocationSiteMode allocation_site_mode_;
   int length_;
 
+  class AllocationSiteModeBits: public BitField<AllocationSiteMode, 0, 1> {};
+  class LengthBits: public BitField<int, 1, 4> {};
+  // Ensure data fits within available bits.
+  STATIC_ASSERT(LAST_ALLOCATION_SITE_MODE == 1);
+  STATIC_ASSERT(kMaximumClonedProperties < 16);
+
   Major MajorKey() { return FastCloneShallowObject; }
-  int NotMissMinorKey() { return length_; }
+  int NotMissMinorKey() {
+    return AllocationSiteModeBits::encode(allocation_site_mode_)
+        | LengthBits::encode(length_);
+  }
 
   DISALLOW_COPY_AND_ASSIGN(FastCloneShallowObjectStub);
 };
 
 
 class CreateAllocationSiteStub : public HydrogenCodeStub {
  public:
   explicit CreateAllocationSiteStub() { }
 
   virtual Handle<Code> GenerateCode(Isolate* isolate);
@@ skipping 1651 matching lines @@
   int MinorKey() { return 0; }
 
   void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(ProfileEntryHookStub);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODE_STUBS_H_