Fix misleading names and comments in mute local variables debugger helper

src/runtime.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 12404 matching lines @@
 // part has all the parameters and locals of the function on the stack frame
 // as well as a materialized arguments object.  As this context replaces
 // the context of the function on the stack frame a new (empty) function
 // is created as well to be used as the closure for the context.
 // This closure as replacements for the one on the stack frame presenting
 // the same view of the values of parameters and local variables as if the
 // piece of JavaScript was evaluated at the point where the function on the
 // stack frame is currently stopped when we compile and run the (direct) eval.
 // Returns array of
 // #0: evaluate result
-// #1: local variables scope materizalized as object before evaluation
-// #2: local variables scope materizalized as object after evaluation
+// #1: local variables materizalized again as object after evaluation, contain
+//     original variable values as they remained on stack
+// #2: local variables materizalized as object before evaluation (and possibly
+//     modified by expression having been executed)
 // Since user expression only reaches (and modifies) copies of local variables,
 // those copies are returned to the caller to allow tracking the changes and
 // manually updating the actual variables.
 RUNTIME_FUNCTION(MaybeObject*, Runtime_DebugEvaluate) {
   HandleScope scope(isolate);
 
   // Check the execution state and decode arguments frame and source to be
   // evaluated.
   ASSERT(args.length() == 6);
   Object* check_result;
@@ skipping 89 matching lines @@
   }
 
   Handle<Object> receiver(frame->receiver(), isolate);
   Object* evaluate_result_object;
   { MaybeObject* maybe_result =
     DebugEvaluate(isolate, context, context_extension, receiver, source);
     if (!maybe_result->ToObject(&evaluate_result_object)) return maybe_result;
   }
   Handle<Object> evaluate_result(evaluate_result_object, isolate);
 
-  Handle<JSObject> local_scope_after = MaterializeLocalScopeWithFrameInspector(
-      isolate, frame, &frame_inspector);
+  Handle<JSObject> local_scope_control_copy =
+      MaterializeLocalScopeWithFrameInspector(isolate, frame,
+                                              &frame_inspector);
 
-  Handle<FixedArray> resultArray =
-      isolate->factory()->NewFixedArray(3);
+  Handle<FixedArray> resultArray = isolate->factory()->NewFixedArray(3);
   resultArray->set(0, *evaluate_result);
+  resultArray->set(1, *local_scope_control_copy);
   resultArray->set(2, *local_scope);
-  resultArray->set(1, *local_scope_after);
 
   return *(isolate->factory()->NewJSArrayWithElements(resultArray));
 }
 
 
 RUNTIME_FUNCTION(MaybeObject*, Runtime_DebugEvaluateGlobal) {
   HandleScope scope(isolate);
 
   // Check the execution state and decode arguments frame and source to be
   // evaluated.
@@ skipping 1363 matching lines @@
     // Handle last resort GC and make sure to allow future allocations
     // to grow the heap without causing GCs (if possible).
     isolate->counters()->gc_last_resort_from_js()->Increment();
     isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags,
                                        "Runtime::PerformGC");
   }
 }
 
 
 } }  // namespace v8::internal