Revert "Reapply change to with/arguments interaction."

src/code-stubs.h

Index: src/code-stubs.h
diff --git a/src/code-stubs.h b/src/code-stubs.h
index 0ca5b4dae0ed0b7456fbd8b9cb95dc69a276dbd2..06cffed4912699cd8ac0f7104d63d4d4aba09266 100644
--- a/src/code-stubs.h
+++ b/src/code-stubs.h
@@ -273,21 +273,20 @@ class FastNewClosureStub : public CodeStub {
 
 class FastNewContextStub : public CodeStub {
  public:
-  // We want no more than 64 different stubs.
-  static const int kMaximumSlots = Context::MIN_CONTEXT_SLOTS + 63;
+  static const int kMaximumSlots = 64;
 
   explicit FastNewContextStub(int slots) : slots_(slots) {
-    ASSERT(slots_ >= Context::MIN_CONTEXT_SLOTS && slots_ <= kMaximumSlots);
+    ASSERT(slots_ > 0 && 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_; }
 };