Changeset 179873 in webkit

Timestamp:

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

Author:

saambarati1@gmail.com

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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecompiler/NodesCodegen.cpp (modified) (1 diff)
• parser/Parser.cpp (modified) (3 diffs)
• tests/typeProfiler/loop.js (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-02-10  Saam Barati  <saambarati1@gmail.com>
+
+        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):
+
 2015-02-09  Saam Barati  <saambarati1@gmail.com>
 

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -2077 +2077 @@
         generator.emitMove(local.get(), propertyName);
         if (generator.vm()->typeProfiler())
-            generator.emitTypeProfilerExpressionInfo(m_lexpr->position(), JSTextPosition(-1, m_lexpr->position().offset + ident.length(), -1));
+            generator.emitTypeProfilerExpressionInfo(simpleBinding->divotStart(), simpleBinding->divotEnd());
         return;
     }

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;
 }

trunk/Source/JavaScriptCore/tests/typeProfiler/loop.js

@@ -2 +2 @@
 
 function testForIn(x) {
-    // FIXME: add support for the following statement types: "for (var arg of expr)" and "for (var arg in expr)"
-    // https://bugs.webkit.org/show_bug.cgi?id=141241
-     
+    for (var arg1 in x)
+        x;
+
     for (arg2 in x)
         x; 
 
-    for ({x: arg3} in x) 
+    for ({x: arg3} in x)
+        x;
+
+    for (var {x: arg4} in x)
         x;
 }
 
 function testForOf(x) {
+    for (var arg1 of x)
+        x;
+
     for (arg2 of x)
         x; 
@@ -18 +24 @@
     for ({x: arg3} of x) 
         x;
+    for (var {x: arg4} of x) 
+        x;
 }
 
 testForIn([1])
-var types = findTypeForExpression(testForIn, "arg2"); 
+var types = findTypeForExpression(testForIn, "arg1"); 
+assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.String) !== -1, "Primitive type names should contain 'String'");
+types = findTypeForExpression(testForIn, "arg2"); 
 assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.String) !== -1, "Primitive type names should contain 'String'");
 types = findTypeForExpression(testForIn, "arg3");
 assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Undefined) !== -1, "Primitive type names should contain 'Undefined'"); 
+types = findTypeForExpression(testForIn, "arg4");
+assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Undefined) !== -1, "Primitive type names should contain 'Undefined'"); 
 
 testForOf([1])
+types = findTypeForExpression(testForOf, "arg1"); 
+assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Integer) !== -1, "Primitive type names should contain 'Integer'");
 types = findTypeForExpression(testForOf, "arg2"); 
 assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Integer) !== -1, "Primitive type names should contain 'Integer'");
 types = findTypeForExpression(testForOf, "arg3");
 assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Undefined) !== -1, "Primitive type names should contain 'Undefined'"); 
+types = findTypeForExpression(testForOf, "arg4");
+assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Undefined) !== -1, "Primitive type names should contain 'Undefined'"); 
 testForOf([{x:29}])
+types = findTypeForExpression(testForOf, "arg1"); 
+assert(types.instructionTypeSet.structures[0].fields.indexOf("x") !== -1, "variable 'arg1' should have field 'x'");
 types = findTypeForExpression(testForOf, "arg2");
-assert(types.instructionTypeSet.structures[0].fields.indexOf("x") !== -1, "variable 'arg1' should have field 'x'");
+assert(types.instructionTypeSet.structures[0].fields.indexOf("x") !== -1, "variable 'arg2' should have field 'x'");
 types = findTypeForExpression(testForOf, "arg3");
 assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Integer) !== -1, "Primitive type names should contain 'Integer'"); 
+types = findTypeForExpression(testForOf, "arg4");
+assert(types.instructionTypeSet.primitiveTypeNames.indexOf(T.Integer) !== -1, "Primitive type names should contain 'Integer'");