Changeset 153074 in webkit

Timestamp:

Jul 23, 2013 6:10:02 PM (11 years ago)

Author:

mark.lam@apple.com

Message:

Need ExpressionRangeInfo before ResolveForPuts in strict mode.
​https://bugs.webkit.org/show_bug.cgi?id=118997.

Reviewed by Oliver Hunt.

If we add an assertion in UnlinkedCodeBlock::expressionRangeForBytecodeOffset()
to ensure that we are able to find an ExpressionRangeInfo for any given bytecode
offset, the following tests will fails:

fast/js/basic-strict-mode.html
fast/js/mozilla/strict/8.7.2.html

With this fix, those tests will no longer fail.

• bytecompiler/NodesCodegen.cpp:

(JSC::AssignResolveNode::emitBytecode):
(JSC::ForInNode::emitBytecode):

• Emit expression info before calls to emitResolveBaseForPut() when in strict mode.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecompiler/NodesCodegen.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-07-10  Mark Lam  <mark.lam@apple.com>
+
+        Need ExpressionRangeInfo before ResolveForPuts in strict mode.
+        https://bugs.webkit.org/show_bug.cgi?id=118997.
+
+        Reviewed by Oliver Hunt.
+
+        If we add an assertion in UnlinkedCodeBlock::expressionRangeForBytecodeOffset()
+        to ensure that we are able to find an ExpressionRangeInfo for any given bytecode
+        offset, the following tests will fails:
+            fast/js/basic-strict-mode.html
+            fast/js/mozilla/strict/8.7.2.html
+        With this fix, those tests will no longer fail.
+
+        * bytecompiler/NodesCodegen.cpp:
+        (JSC::AssignResolveNode::emitBytecode):
+        (JSC::ForInNode::emitBytecode):
+        - Emit expression info before calls to emitResolveBaseForPut() when in strict mode.
+
 2013-07-23  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -1362 +1362 @@
 
     NonlocalResolveInfo resolveVerifier;
+    if (generator.isStrictMode())
+        generator.emitExpressionInfo(divot(), divotStartOffset(), divotEndOffset(), divotLine(), divotLineStart());
     RefPtr<RegisterID> base = generator.emitResolveBaseForPut(generator.newTemporary(), resolveResult, m_ident, resolveVerifier);
     if (dst == generator.ignoredResult())
@@ -1740 +1742 @@
             RefPtr<RegisterID> protect = propertyName;
             NonlocalResolveInfo resolveVerifier;
+            if (generator.isStrictMode())
+                generator.emitExpressionInfo(divot(), divotStartOffset(), divotEndOffset(), divotLine(), divotLineStart());
             RegisterID* base = generator.emitResolveBaseForPut(generator.newTemporary(), resolveResult, ident, resolveVerifier);