Use a different map to distinguish eval contexts

src/code-stubs.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_CODE_STUBS_H_
 #define V8_CODE_STUBS_H_
 
 #include "src/allocation.h"
 #include "src/assembler.h"
 #include "src/codegen.h"
@@ skipping 794 matching lines @@
   static compiler::Node* Generate(CodeStubAssembler* assembler,
                                   compiler::Node* shared_info,
                                   compiler::Node* context);
 
   DEFINE_CALL_INTERFACE_DESCRIPTOR(FastNewClosure);
   DEFINE_TURBOFAN_CODE_STUB(FastNewClosure, TurboFanCodeStub);
 };
 
 class FastNewFunctionContextStub final : public TurboFanCodeStub {
  public:
-  static const int kMaximumSlots = 0x8000;
+  static int MaximumSlots();
 
-  explicit FastNewFunctionContextStub(Isolate* isolate)
-      : TurboFanCodeStub(isolate) {}
+  explicit FastNewFunctionContextStub(Isolate* isolate, ScopeType scope_type)
+      : TurboFanCodeStub(isolate) {
+    minor_key_ = ScopeTypeBits::encode(scope_type);
+  }
 
   static compiler::Node* Generate(CodeStubAssembler* assembler,
                                   compiler::Node* function,
                                   compiler::Node* slots,
-                                  compiler::Node* context);
+                                  compiler::Node* context,
+                                  ScopeType scope_type);
+
+  ScopeType scope_type() const {
+    return static_cast<ScopeType>(ScopeTypeBits::decode(minor_key_));
+  }
 
  private:
+  static const int kMaximumSlots = 0x8000;
+  static const int kSmallMaximumSlots = 10;
+
   // FastNewFunctionContextStub can only allocate closures which fit in the
   // new space.
   STATIC_ASSERT(((kMaximumSlots + Context::MIN_CONTEXT_SLOTS) * kPointerSize +
                  FixedArray::kHeaderSize) < kMaxRegularHeapObjectSize);
 
   DEFINE_CALL_INTERFACE_DESCRIPTOR(FastNewFunctionContext);
   DEFINE_TURBOFAN_CODE_STUB(FastNewFunctionContext, TurboFanCodeStub);
+
+  class ScopeTypeBits : public BitField<bool, 0, 8> {};

[Michael Starzinger, 2016/12/15 09:42:59]

nit: Can we move this up three lines, so that the macro-generated members stay
at the bottom?

[Dan Ehrenberg, 2016/12/15 23:51:50]

Done.

 };
 
-
 class FastNewObjectStub final : public PlatformCodeStub {
  public:
   explicit FastNewObjectStub(Isolate* isolate) : PlatformCodeStub(isolate) {}
 
   DEFINE_CALL_INTERFACE_DESCRIPTOR(FastNewObject);
   DEFINE_PLATFORM_CODE_STUB(FastNewObject, PlatformCodeStub);
 };
 
 
 // TODO(turbofan): This stub should be possible to write in TurboFan
@@ skipping 1797 matching lines @@
 #undef DEFINE_PLATFORM_CODE_STUB
 #undef DEFINE_HANDLER_CODE_STUB
 #undef DEFINE_HYDROGEN_CODE_STUB
 #undef DEFINE_CODE_STUB
 #undef DEFINE_CODE_STUB_BASE
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CODE_STUBS_H_