Changeset 106589 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

Feb 2, 2012, 1:19:53 PM (13 years ago)

Author:

[email protected]

Message:

Getters and setters cause line numbers in errors/console.log to be offset for the whole file
​https://bugs.webkit.org/show_bug.cgi?id=77675

Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

Our default literal parsing logic doesn't handle the extra work required for
getters and setters. When it encounters one, it rolls back the lexer and
then switches to a more complete parsing function. Unfortunately it was only
winding back the character position, and was ignoring the line number and
other lexer data. This led to every getter and setter causing the line number
to be incorrectly incremented leading to increasingly incorrect numbers for
the rest of the file.

• parser/Parser.cpp:

(JSC::::parseObjectLiteral):

LayoutTests:

Add getter and setter line number tests.

• fast/js/exception-linenums-expected.txt:
• fast/js/script-tests/exception-linenums.js:

(firstPropIsGetter.get getter):
(secondPropIsGetter.prop.1.get getter):
(firstPropIsSetter.set setter):
(secondPropIsSetter.prop.1.set setter):

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1241 +1241 @@
 {
     int startOffset = m_token.m_data.intValue;
+    unsigned oldLastLineNumber = m_lexer->lastLineNumber();
+    unsigned oldLineNumber = m_lexer->lineNumber();
     consumeOrFailWithFlags(OPENBRACE, TreeBuilder::DontBuildStrings);
     
@@ -1253 +1255 @@
         m_lexer->setOffset(startOffset);
         next();
+        m_lexer->setLastLineNumber(oldLastLineNumber);
+        m_lexer->setLineNumber(oldLineNumber);
         return parseStrictObjectLiteral(context);
     }
@@ -1267 +1271 @@
             m_lexer->setOffset(startOffset);
             next();
+            m_lexer->setLastLineNumber(oldLastLineNumber);
+            m_lexer->setLineNumber(oldLineNumber);
             return parseStrictObjectLiteral(context);
         }