Use a different map to distinguish eval contexts

src/contexts.cc

 // Copyright 2011 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/contexts.h"
 
 #include "src/bootstrapper.h"
 #include "src/debug/debug.h"
 #include "src/isolate-inl.h"
 
@@ skipping 56 matching lines @@
   // declaration scope. That's just a small performance shortcut.
   return ext->IsContextExtension() ||
          ScopeInfo::cast(ext)->is_declaration_scope();
 }
 
 
 Context* Context::declaration_context() {
   Context* current = this;
   while (!current->is_declaration_context()) {
     current = current->previous();
-    DCHECK(current->closure() == closure());
+    // Note: the closure may change while finding the declaration context,
+    // e.g., for sloppy direct eval
   }
   return current;
 }
 
 Context* Context::closure_context() {
   Context* current = this;
   while (!current->IsFunctionContext() && !current->IsScriptContext() &&
          !current->IsNativeContext()) {
     current = current->previous();
     DCHECK(current->closure() == closure());
@@ skipping 17 matching lines @@
 JSReceiver* Context::extension_receiver() {
   DCHECK(IsNativeContext() || IsWithContext() ||
          IsFunctionContext() || IsBlockContext());
   return IsWithContext() ? JSReceiver::cast(
                                ContextExtension::cast(extension())->extension())
                          : extension_object();
 }
 
 ScopeInfo* Context::scope_info() {
   DCHECK(!IsNativeContext());
   if (IsFunctionContext() || IsModuleContext()) {

[adamk, 2016/11/10 19:32:07]

I think you want to add "|| IsEvalContext()" here.

[Dan Ehrenberg, 2016/11/11 23:51:57]

Added that here and in a bunch of other places

     return closure()->shared()->scope_info();
   }
   HeapObject* object = extension();
   if (object->IsContextExtension()) {
     DCHECK(IsBlockContext() || IsCatchContext() || IsWithContext() ||
            IsDebugEvaluateContext());
     object = ContextExtension::cast(object)->scope_info();
   }
   return ScopeInfo::cast(object);
 }
@@ skipping 462 matching lines @@
 
   int previous_value = errors_thrown()->value();
   set_errors_thrown(Smi::FromInt(previous_value + 1));
 }
 
 
 int Context::GetErrorsThrown() { return errors_thrown()->value(); }
 
 }  // namespace internal
 }  // namespace v8