Reviewers: mvstanton,

Description:
Version 4.1.0.8 (cherry-pick)

Merged 10a58904ac845cf97c21116c1d13d61e1afe8f34

Fix debug-debugger.js wrt strict mode.

BUG=v8:3790
LOG=N
[email protected]

Please review this at https://codereview.chromium.org/854423002/

Base URL: https://chromium.googlesource.com/v8/[email protected]

Affected files (+4, -4 lines):
  M src/debug-debugger.js
  M src/version.cc


Index: src/debug-debugger.js
diff --git a/src/debug-debugger.js b/src/debug-debugger.js
index 09f479e1e8b6814aca5927c1f14ca353f20edf62..c24b4785535a1239f2dc0c5735a482d8b744ccd5 100644
--- a/src/debug-debugger.js
+++ b/src/debug-debugger.js
@@ -1887,7 +1887,7 @@ DebugCommandProcessor.prototype.resolveFrameFromScopeDescription_ =
   // Get the frame for which the scope or scopes are requested.
   // With no frameNumber argument use the currently selected frame.
   if (scope_description && !IS_UNDEFINED(scope_description.frameNumber)) {
-    frame_index = scope_description.frameNumber;
+    var frame_index = scope_description.frameNumber;
     if (frame_index < 0 || this.exec_state_.frameCount() <= frame_index) {
       throw new Error('Invalid frame number');
     }
@@ -1972,7 +1972,7 @@ DebugCommandProcessor.resolveValue_ = function(value_description) {
     var value_mirror = LookupMirror(value_description.handle);
     if (!value_mirror) {
       throw new Error("Failed to resolve value by handle, ' #" +
-          mapping.handle + "# not found");
+          value_description.handle + "# not found");
     }
     return value_mirror.value();
   } else if ("stringDescription" in value_description) {
@@ -2127,7 +2127,7 @@ DebugCommandProcessor.prototype.lookupRequest_ = function(request, response) {

   // Set 'includeSource' option for script lookup.
   if (!IS_UNDEFINED(request.arguments.includeSource)) {
-    includeSource = %ToBoolean(request.arguments.includeSource);
+    var includeSource = %ToBoolean(request.arguments.includeSource);
     response.setOption('includeSource', includeSource);
   }

Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index c71ecff3421a0f509e1db3c8b15eb2518ad3dffe..837cbd73963d06d4518689bfd5e3d3d3110e5ce5 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     4
 #define MINOR_VERSION     1
 #define BUILD_NUMBER      0
-#define PATCH_LEVEL       7
+#define PATCH_LEVEL       8
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to