Correctly hook up materialized receiver into the evaluation context chain.

src/runtime/runtime-debug.cc

 // Copyright 2014 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/v8.h"
 
 #include "src/accessors.h"
 #include "src/arguments.h"
 #include "src/compiler.h"
 #include "src/debug.h"
@@ skipping 2482 matching lines @@
       : isolate_(isolate),
         frame_(frame),
         inlined_jsframe_index_(inlined_jsframe_index) {
     FrameInspector frame_inspector(frame, inlined_jsframe_index, isolate);
     Handle<JSFunction> function =
         handle(JSFunction::cast(frame_inspector.GetFunction()));
     Handle<Context> outer_context = handle(function->context(), isolate);
     outer_info_ = handle(function->shared());
     Handle<Context> inner_context;
 
-    // The "this" binding, if any, can't be bound via "with".  If we need to,
-    // add another node onto the outer context to bind "this".
-    if (!MaterializeReceiver(isolate, outer_context, function, frame)
-             .ToHandle(&outer_context))
-      return;
-
     bool stop = false;
     for (ScopeIterator it(isolate, frame, inlined_jsframe_index);
          !it.Failed() && !it.Done() && !stop; it.Next()) {
       ScopeIterator::ScopeType scope_type = it.Type();
 
       if (scope_type == ScopeIterator::ScopeTypeLocal) {
+        Handle<Context> parent_context =
+            it.HasContext() ? it.CurrentContext() : outer_context;
+
+        // The "this" binding, if any, can't be bound via "with".  If we need
+        // to, add another node onto the outer context to bind "this".
+        if (!MaterializeReceiver(isolate, parent_context, function, frame)
+                 .ToHandle(&parent_context))
+          return;
+
         Handle<JSObject> materialized_function =
             NewJSObjectWithNullProto(isolate);
 
         if (!MaterializeStackLocalsWithFrameInspector(
                  isolate, materialized_function, function, &frame_inspector)
                  .ToHandle(&materialized_function))
           return;
 
         if (!MaterializeArgumentsObject(isolate, materialized_function,
                                         function)
                  .ToHandle(&materialized_function))
           return;
 
-        Handle<Context> parent_context =
-            it.HasContext() ? it.CurrentContext() : outer_context;
         Handle<Context> with_context = isolate->factory()->NewWithContext(
             function, parent_context, materialized_function);
 
         ContextChainElement context_chain_element;
         context_chain_element.original_context = it.CurrentContext();
         context_chain_element.materialized_object = materialized_function;
         context_chain_element.scope_info = it.CurrentScopeInfo();
         context_chain_.Add(context_chain_element);
 
         stop = true;
@@ skipping 670 matching lines @@
   return Smi::FromInt(isolate->debug()->is_active());
 }
 
 
 RUNTIME_FUNCTION(Runtime_DebugBreakInOptimizedCode) {
   UNIMPLEMENTED();
   return NULL;
 }
 }  // namespace internal
 }  // namespace v8