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

Timestamp:

Feb 10, 2015, 11:01:41 AM (10 years ago)

Author:

[email protected]

Message:

Parser::parseVarDeclarationList gets the wrong JSToken for the last identifier
​https://bugs.webkit.org/show_bug.cgi?id=141272

Reviewed by Oliver Hunt.

This patch fixes a bug where the wrong text location would be
assigned to a variable declaration inside a ForIn/ForOf loop.
It also fixes a bug in the type profiler where the type profiler
emits the wrong text offset for a ForIn loop's variable declarator
when it's not a pattern node.

• bytecompiler/NodesCodegen.cpp:

(JSC::ForInNode::emitLoopHeader):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseVarDeclarationList):

• tests/typeProfiler/loop.js:

(testForIn):
(testForOf):

File:

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

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -453 +453 @@
     TreeExpression tail = 0;
     const Identifier* lastIdent;
+    JSToken lastIdentToken; 
     do {
         lastIdent = 0;
@@ -467 +468 @@
             const Identifier* name = m_token.m_data.ident;
             lastIdent = name;
+            lastIdentToken = m_token;
             next();
             hasInitializer = match(EQUAL);
@@ -507 +509 @@
     } while (match(COMMA));
     if (lastIdent)
-        lastPattern = createBindingPattern(context, DeconstructToVariables, *lastIdent, 0, m_token);
+        lastPattern = createBindingPattern(context, DeconstructToVariables, *lastIdent, 0, lastIdentToken);
     return head;
 }