Reviewers: Kevin Millikin,
Description:
Adjust position recorded for call expressions.
For calls of the form ident(...) record position of the identifier as the
position of the call. For other calls record positions of the opening
parenthesis.
This guarantees that for expressions of the form function(){}() call
position
will not intersect with positions recorded for function literal which is
used by
the debugger for scope chain resolution.
R=kmilli...@chromium.org
BUG=http://crbug.com/109195
TEST=test/mjsunit/regress/regress-109195.js
Please review this at http://codereview.chromium.org/9125001/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/parser.cc
M src/scopes.cc
A test/mjsunit/regress/regress-109195.js
Index: src/parser.cc
diff --git a/src/parser.cc b/src/parser.cc
index
c1681cfbd09da063960fedefac2572d059690a81..6531f10704c22996c5b0c0c0967836c71adfce7b
100644
--- a/src/parser.cc
+++ b/src/parser.cc
@@ -3003,7 +3003,19 @@ Expression*
Parser::ParseLeftHandSideExpression(bool* ok) {
}
case Token::LPAREN: {
- int pos = scanner().location().beg_pos;
+ int pos;
+ if (scanner().current_token() == Token::IDENTIFIER) {
+ // For call of an identifier we want to report position of
+ // the identifier as position of the call in the stack trace.
+ pos = scanner().location().beg_pos;
+ } else {
+ // For other kinds of calls we record position of the
parenthesis as
+ // position of the call. Note that this is extremely important
for
+ // expressions of the form function(){...}() for which call
position
+ // should not point to the closing brace otherwise it will
intersect
+ // with positions recorded for function literal and confuse
debugger.
+ pos = scanner().peek_location().beg_pos;
+ }
ZoneList<Expression*>* args = ParseArguments(CHECK_OK);
// Keep track of eval() calls since they disable all local variable
Index: src/scopes.cc
diff --git a/src/scopes.cc b/src/scopes.cc
index
4a6d0a7fae2f4e2b2a2d01913d9ae6b07b2f56b0..d0ee8ec7f21af11758a2cb3c49dcf9f8a2aa6b18
100644
--- a/src/scopes.cc
+++ b/src/scopes.cc
@@ -808,7 +808,7 @@ void Scope::Print(int n) {
PrintF(")");
}
- PrintF(" {\n");
+ PrintF(" { // (%d, %d)\n", start_position(), end_position());
// Function name, if any (named function literals, only).
if (function_ != NULL) {
Index: test/mjsunit/regress/regress-109195.js
diff --git a/test/mjsunit/regress/regress-109195.js
b/test/mjsunit/regress/regress-109195.js
new file mode 100644
index
0000000000000000000000000000000000000000..97538aa1674357798c1083e98cdca800c456e0a5
--- /dev/null
+++ b/test/mjsunit/regress/regress-109195.js
@@ -0,0 +1,65 @@
+// 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
+// with the distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived
+// from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Flags: --expose-debug-as debug
+var Debug = debug.Debug;
+
+function listener(event, exec_state, event_data, data) {
+ for (var i = 0, n = exec_state.frameCount(); i < n; i++) {
+ exec_state.frame().scopeCount(i);
+ }
+ exec_state.prepareStep(Debug.StepAction.Continue, 1);
+}
+
+Debug.setListener(listener);
+
+var F = function () {
+ 1, function () {
+ var d = 0;
+ (function () { d; });
+ debugger;
+ }();
+};
+
+var src = "(" + F.toString() + ")()";
+eval(src);
+
+Function.prototype.__defineGetter__("f", function () {
+ debugger;
+ return 0;
+});
+
+var G = function () {
+ 1, function () {
+ var d = 0;
+ (function () { d; });
+ debugger;
+ }['f'];
+};
+
+var src = "(" + G.toString() + ")()";
+eval(src);
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
