Reapply change to with/arguments interaction.

src/code-stubs.h

 // Copyright 2011 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 255 matching lines @@
 
  private:
   const char* GetName() { return "FastNewClosureStub"; }
   Major MajorKey() { return FastNewClosure; }
   int MinorKey() { return 0; }
 };
 
 
 class FastNewContextStub : public CodeStub {
  public:
-  static const int kMaximumSlots = 64;
+  // We want no more than 64 different stubs.
+  static const int kMaximumSlots = Context::MIN_CONTEXT_SLOTS + 63;
 
   explicit FastNewContextStub(int slots) : slots_(slots) {
-    ASSERT(slots_ > 0 && slots <= kMaximumSlots);
+    ASSERT(slots_ >= Context::MIN_CONTEXT_SLOTS && slots_ <= kMaximumSlots);
   }
 
   void Generate(MacroAssembler* masm);
 
  private:
+  virtual const char* GetName() { return "FastNewContextStub"; }
+  virtual Major MajorKey() { return FastNewContext; }
+  virtual int MinorKey() { return slots_; }
+
   int slots_;
-
-  const char* GetName() { return "FastNewContextStub"; }
-  Major MajorKey() { return FastNewContext; }
-  int MinorKey() { return slots_; }
 };
 
 
 class FastCloneShallowArrayStub : public CodeStub {
  public:
   // Maximum length of copied elements array.
   static const int kMaximumClonedLength = 8;
 
   enum Mode {
     CLONE_ELEMENTS,
@@ skipping 630 matching lines @@
  private:
   MacroAssembler* masm_;
   bool previous_allow_;
 
   DISALLOW_COPY_AND_ASSIGN(AllowStubCallsScope);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODE_STUBS_H_