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 2581 matching lines @@
 }
 
 void FastNewClosureStub::GenerateAssembly(CodeStubAssembler* assembler) const {
   assembler->Return(
       Generate(assembler, assembler->Parameter(0), assembler->Parameter(1)));
 }
 
 // static
 compiler::Node* FastNewFunctionContextStub::Generate(
     CodeStubAssembler* assembler, compiler::Node* function,
-    compiler::Node* slots, compiler::Node* context) {
+    compiler::Node* slots, compiler::Node* context, bool for_eval) {
   typedef compiler::Node Node;
 
   Node* min_context_slots =
       assembler->Int32Constant(Context::MIN_CONTEXT_SLOTS);
   Node* length = assembler->Int32Add(slots, min_context_slots);
   Node* size = assembler->Int32Add(
       assembler->Word32Shl(length, assembler->Int32Constant(kPointerSizeLog2)),
       assembler->Int32Constant(FixedArray::kHeaderSize));
 
   // Create a new closure from the given function info in new space
   Node* function_context = assembler->Allocate(size);
 
   Isolate* isolate = assembler->isolate();
-  assembler->StoreMapNoWriteBarrier(
-      function_context,
-      assembler->HeapConstant(isolate->factory()->function_context_map()));
+  Handle<Map> map = for_eval ? isolate->factory()->eval_context_map()
+                             : isolate->factory()->function_context_map();
+  assembler->StoreMapNoWriteBarrier(function_context,
+                                    assembler->HeapConstant(map));
   assembler->StoreObjectFieldNoWriteBarrier(function_context,
                                             Context::kLengthOffset,
                                             assembler->SmiFromWord32(length));
 
   // Set up the fixed slots.
   assembler->StoreFixedArrayElement(
       function_context, assembler->Int32Constant(Context::CLOSURE_INDEX),
       function, SKIP_WRITE_BARRIER);
   assembler->StoreFixedArrayElement(
       function_context, assembler->Int32Constant(Context::PREVIOUS_INDEX),
@@ skipping 20 matching lines @@
   return function_context;
 }
 
 void FastNewFunctionContextStub::GenerateAssembly(
     CodeStubAssembler* assembler) const {
   typedef compiler::Node Node;
   Node* function = assembler->Parameter(Descriptor::kFunction);
   Node* slots = assembler->Parameter(FastNewFunctionContextDescriptor::kSlots);
   Node* context = assembler->Parameter(Descriptor::kContext);
 
-  assembler->Return(Generate(assembler, function, slots, context));
+  assembler->Return(Generate(assembler, function, slots, context, for_eval()));
 }
 
 // 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 573 matching lines @@
 
   if (type == MachineType::Pointer()) {
     return Representation::External();
   }
 
   return Representation::Tagged();
 }
 
 }  // namespace internal
 }  // namespace v8