Use a different map to distinguish eval contexts

src/code-stubs.cc

 // 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.
 
 #include "src/code-stubs.h"
 
 #include <sstream>
 
 #include "src/ast/ast.h"
 #include "src/bootstrapper.h"
@@ skipping 2585 matching lines @@
 void FastNewClosureStub::GenerateAssembly(
     compiler::CodeAssemblerState* state) const {
   typedef compiler::Node Node;
   CodeStubAssembler assembler(state);
   Node* shared = assembler.Parameter(Descriptor::kSharedFunctionInfo);
   Node* context = assembler.Parameter(Descriptor::kContext);
   assembler.Return(Generate(&assembler, shared, context));
 }
 
 // static
+int FastNewFunctionContextStub::MaximumSlots() {
+  return FLAG_test_small_max_function_context_stub_size ? kSmallMaximumSlots
+                                                        : kMaximumSlots;
+}
+
+// static
 compiler::Node* FastNewFunctionContextStub::Generate(
     CodeStubAssembler* assembler, compiler::Node* function,
-    compiler::Node* slots, compiler::Node* context) {
+    compiler::Node* slots, compiler::Node* context, ScopeType scope_type) {
   typedef compiler::Node Node;
 
   slots = assembler->ChangeUint32ToWord(slots);
 
   // TODO(ishell): Use CSA::OptimalParameterMode() here.
   CodeStubAssembler::ParameterMode mode = CodeStubAssembler::INTPTR_PARAMETERS;
   Node* min_context_slots =
       assembler->IntPtrConstant(Context::MIN_CONTEXT_SLOTS);
   Node* length = assembler->IntPtrAdd(slots, min_context_slots);
   Node* size =
       assembler->GetFixedArrayAllocationSize(length, FAST_ELEMENTS, mode);
 
   // Create a new closure from the given function info in new space
   Node* function_context = assembler->Allocate(size);
 
-  assembler->StoreMapNoWriteBarrier(function_context,
-                                    Heap::kFunctionContextMapRootIndex);
+  Heap::RootListIndex context_type;
+  switch (scope_type) {
+    case EVAL_SCOPE:
+      context_type = Heap::kEvalContextMapRootIndex;
+      break;
+    case FUNCTION_SCOPE:
+      context_type = Heap::kFunctionContextMapRootIndex;
+      break;
+    default:
+      UNREACHABLE();
+  }
+  assembler->StoreMapNoWriteBarrier(function_context, context_type);
   assembler->StoreObjectFieldNoWriteBarrier(
       function_context, Context::kLengthOffset, assembler->SmiTag(length));
 
   // Set up the fixed slots.
   assembler->StoreFixedArrayElement(function_context, Context::CLOSURE_INDEX,
                                     function, SKIP_WRITE_BARRIER);
   assembler->StoreFixedArrayElement(function_context, Context::PREVIOUS_INDEX,
                                     context, SKIP_WRITE_BARRIER);
   assembler->StoreFixedArrayElement(function_context, Context::EXTENSION_INDEX,
                                     assembler->TheHoleConstant(),
@@ skipping 19 matching lines @@
 }
 
 void FastNewFunctionContextStub::GenerateAssembly(
     compiler::CodeAssemblerState* state) const {
   typedef compiler::Node Node;
   CodeStubAssembler assembler(state);
   Node* function = assembler.Parameter(Descriptor::kFunction);
   Node* slots = assembler.Parameter(Descriptor::kSlots);
   Node* context = assembler.Parameter(Descriptor::kContext);
 
-  assembler.Return(Generate(&assembler, function, slots, context));
+  assembler.Return(
+      Generate(&assembler, function, slots, context, scope_type()));
 }
 
 // static
 compiler::Node* FastCloneRegExpStub::Generate(CodeStubAssembler* assembler,
                                               compiler::Node* closure,
                                               compiler::Node* literal_index,
                                               compiler::Node* pattern,
                                               compiler::Node* flags,
                                               compiler::Node* context) {
   typedef CodeStubAssembler::Label Label;
@@ skipping 541 matching lines @@
 }
 
 ArrayConstructorStub::ArrayConstructorStub(Isolate* isolate)
     : PlatformCodeStub(isolate) {}
 
 InternalArrayConstructorStub::InternalArrayConstructorStub(Isolate* isolate)
     : PlatformCodeStub(isolate) {}
 
 }  // namespace internal
 }  // namespace v8