<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164283] releases/WebKitGTK/webkit-2.2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164283">164283</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-18 03:55:49 -0800 (Tue, 18 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/155730">r155730</a> - DFG AI assumes that ToThis can never return non-object if it is passed an object, and operationToThis will get the wrong value of isStrictMode() if there's inlining
https://bugs.webkit.org/show_bug.cgi?id=121330
Source/JavaScriptCore:
Reviewed by Mark Hahnenberg and Oliver Hunt.
Also print whether a function is strict mode in debug dumps.
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpAssumingJITType):
* bytecode/CodeOrigin.cpp:
(JSC::InlineCallFrame::dumpInContext):
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::::executeEffects):
* dfg/DFGOperations.cpp:
* dfg/DFGOperations.h:
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
Tools:
Reviewed by Mark Hahnenberg and Oliver Hunt.
We should run tests even if they don't have expected files yet.
* Scripts/run-layout-jsc:
LayoutTests:
Reviewed by Mark Hahnenberg and Oliver Hunt.
* js/dfg-strict-mode-to-this-expected.txt: Added.
* js/dfg-strict-mode-to-this.html: Added.
* js/jsc-test-list:
* js/script-tests/dfg-strict-mode-to-this.js: Added.
(thingy.bar):
(thingy.foo):
(thingy):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCorebytecodeCodeBlockcpp">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCorebytecodeCodeOrigincpp">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/CodeOrigin.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGOperationscpp">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGOperationsh">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGOperations.h</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit22ToolsChangeLog">releases/WebKitGTK/webkit-2.2/Tools/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>releases/WebKitGTK/webkit-2.2/LayoutTests/js/</li>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestsjsdfgstrictmodetothisexpectedtxt">releases/WebKitGTK/webkit-2.2/LayoutTests/js/dfg-strict-mode-to-this-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestsjsdfgstrictmodetothishtml">releases/WebKitGTK/webkit-2.2/LayoutTests/js/dfg-strict-mode-to-this.html</a></li>
<li>releases/WebKitGTK/webkit-2.2/LayoutTests/js/script-tests/</li>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestsjsscripttestsdfgstrictmodetothisjs">releases/WebKitGTK/webkit-2.2/LayoutTests/js/script-tests/dfg-strict-mode-to-this.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit22LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-09-13 Filip Pizlo <fpizlo@apple.com>
+
+ DFG AI assumes that ToThis can never return non-object if it is passed an object, and operationToThis will get the wrong value of isStrictMode() if there's inlining
+ https://bugs.webkit.org/show_bug.cgi?id=121330
+
+ Reviewed by Mark Hahnenberg and Oliver Hunt.
+
+ * js/dfg-strict-mode-to-this-expected.txt: Added.
+ * js/dfg-strict-mode-to-this.html: Added.
+ * js/jsc-test-list:
+ * js/script-tests/dfg-strict-mode-to-this.js: Added.
+ (thingy.bar):
+ (thingy.foo):
+ (thingy):
+
</ins><span class="cx"> 2013-12-06 Lukasz Gajowy <l.gajowy@samsung.com>
</span><span class="cx">
</span><span class="cx"> [ATK] Missing aria roles mappings
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22LayoutTestsjsdfgstrictmodetothisexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.2/LayoutTests/js/dfg-strict-mode-to-this-expected.txt (0 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/js/dfg-strict-mode-to-this-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/js/dfg-strict-mode-to-this-expected.txt 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that doing to-this conversion in strict mode doesn't cause us to believe that if the input is an object then the output is also an object.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS thingy() is false on all iterations including after DFG tier-up.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit22LayoutTestsjsdfgstrictmodetothishtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.2/LayoutTests/js/dfg-strict-mode-to-this.html (0 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/js/dfg-strict-mode-to-this.html (rev 0)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/js/dfg-strict-mode-to-this.html 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/dfg-strict-mode-to-this.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit22LayoutTestsjsscripttestsdfgstrictmodetothisjs"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.2/LayoutTests/js/script-tests/dfg-strict-mode-to-this.js (0 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/js/script-tests/dfg-strict-mode-to-this.js (rev 0)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/js/script-tests/dfg-strict-mode-to-this.js 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+description("Tests that doing to-this conversion in strict mode doesn't cause us to believe that if the input is an object then the output is also an object.");
+
+function thingy() {
+ "use strict";
+ function bar() {
+ return this instanceof Object;
+ }
+ function foo() {
+ return bar();
+ }
+ return foo();
+}
+
+dfgShouldBe(thingy, "thingy()", "false");
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/ChangeLog (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/ChangeLog 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/ChangeLog 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2013-09-13 Filip Pizlo <fpizlo@apple.com>
+
+ DFG AI assumes that ToThis can never return non-object if it is passed an object, and operationToThis will get the wrong value of isStrictMode() if there's inlining
+ https://bugs.webkit.org/show_bug.cgi?id=121330
+
+ Reviewed by Mark Hahnenberg and Oliver Hunt.
+
+ Also print whether a function is strict mode in debug dumps.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpAssumingJITType):
+ * bytecode/CodeOrigin.cpp:
+ (JSC::InlineCallFrame::dumpInContext):
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::::executeEffects):
+ * dfg/DFGOperations.cpp:
+ * dfg/DFGOperations.h:
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+
</ins><span class="cx"> 2013-09-10 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Introduce a SpecInt48 type and be more careful about what we mean by "Top"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/CodeBlock.cpp (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -140,6 +140,8 @@
</span><span class="cx"> out.print(" (SABI)");
</span><span class="cx"> if (ownerExecutable()->neverInline())
</span><span class="cx"> out.print(" (NeverInline)");
</span><ins>+ if (ownerExecutable()->isStrictMode())
+ out.print(" (StrictMode)");
</ins><span class="cx"> out.print("]");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCorebytecodeCodeOrigincpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/CodeOrigin.cpp (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/CodeOrigin.cpp 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/bytecode/CodeOrigin.cpp 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -110,7 +110,10 @@
</span><span class="cx">
</span><span class="cx"> void InlineCallFrame::dumpInContext(PrintStream& out, DumpContext* context) const
</span><span class="cx"> {
</span><del>- out.print(briefFunctionInformation(), ":<", RawPointer(executable.get()), ", bc#", caller.bytecodeIndex, ", ", specializationKind());
</del><ins>+ out.print(briefFunctionInformation(), ":<", RawPointer(executable.get()));
+ if (executable->isStrictMode())
+ out.print(" (StrictMode)");
+ out.print(", bc#", caller.bytecodeIndex, ", ", specializationKind());
</ins><span class="cx"> if (callee)
</span><span class="cx"> out.print(", known callee: ", inContext(JSValue(callee.get()), context));
</span><span class="cx"> else
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -1071,8 +1071,12 @@
</span><span class="cx"> AbstractValue& source = forNode(node->child1());
</span><span class="cx"> AbstractValue& destination = forNode(node);
</span><span class="cx">
</span><del>- destination = source;
- destination.merge(SpecObject);
</del><ins>+ if (m_graph.executableFor(node->codeOrigin)->isStrictMode())
+ destination.makeHeapTop();
+ else {
+ destination = source;
+ destination.merge(SpecObject);
+ }
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGOperations.cpp (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -465,9 +465,17 @@
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><span class="cx">
</span><del>- return JSValue::encode(JSValue::decode(encodedOp).toThis(exec, exec->codeBlock()->isStrictMode() ? StrictMode : NotStrictMode));
</del><ins>+ return JSValue::encode(JSValue::decode(encodedOp).toThis(exec, NotStrictMode));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+EncodedJSValue DFG_OPERATION operationToThisStrict(ExecState* exec, EncodedJSValue encodedOp)
+{
+ VM* vm = &exec->vm();
+ NativeCallFrameTracer tracer(vm, exec);
+
+ return JSValue::encode(JSValue::decode(encodedOp).toThis(exec, StrictMode));
+}
+
</ins><span class="cx"> JSCell* DFG_OPERATION operationCreateThis(ExecState* exec, JSObject* constructor, int32_t inlineCapacity)
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGOperationsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGOperations.h (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGOperations.h 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGOperations.h 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -134,6 +134,7 @@
</span><span class="cx"> JSCell* DFG_OPERATION operationNewObject(ExecState*, Structure*) WTF_INTERNAL;
</span><span class="cx"> JSCell* DFG_OPERATION operationCreateThis(ExecState*, JSObject* constructor, int32_t inlineCapacity) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue DFG_OPERATION operationToThis(ExecState*, EncodedJSValue encodedOp1) WTF_INTERNAL;
</span><ins>+EncodedJSValue DFG_OPERATION operationToThisStrict(ExecState*, EncodedJSValue encodedOp1) WTF_INTERNAL;
</ins><span class="cx"> EncodedJSValue DFG_OPERATION operationValueAdd(ExecState*, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue DFG_OPERATION operationValueAddNotNumber(ExecState*, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue DFG_OPERATION operationGetByVal(ExecState*, EncodedJSValue encodedBase, EncodedJSValue encodedProperty) WTF_INTERNAL;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -3668,9 +3668,14 @@
</span><span class="cx"> TrustedImm32(FinalObjectType)));
</span><span class="cx"> m_jit.move(thisValuePayloadGPR, tempGPR);
</span><span class="cx"> m_jit.move(thisValueTagGPR, tempTagGPR);
</span><ins>+ J_DFGOperation_EJ function;
+ if (m_jit.graph().executableFor(node->codeOrigin)->isStrictMode())
+ function = operationToThisStrict;
+ else
+ function = operationToThis;
</ins><span class="cx"> addSlowPathGenerator(
</span><span class="cx"> slowPathCall(
</span><del>- slowCases, this, operationToThis,
</del><ins>+ slowCases, this, function,
</ins><span class="cx"> JSValueRegs(tempTagGPR, tempGPR), thisValueTagGPR, thisValuePayloadGPR));
</span><span class="cx">
</span><span class="cx"> jsValueResult(tempTagGPR, tempGPR, node);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -3584,8 +3584,13 @@
</span><span class="cx"> MacroAssembler::Address(tempGPR, Structure::typeInfoTypeOffset()),
</span><span class="cx"> TrustedImm32(FinalObjectType)));
</span><span class="cx"> m_jit.move(thisValueGPR, tempGPR);
</span><ins>+ J_DFGOperation_EJ function;
+ if (m_jit.graph().executableFor(node->codeOrigin)->isStrictMode())
+ function = operationToThisStrict;
+ else
+ function = operationToThis;
</ins><span class="cx"> addSlowPathGenerator(
</span><del>- slowPathCall(slowCases, this, operationToThis, tempGPR, thisValueGPR));
</del><ins>+ slowPathCall(slowCases, this, function, tempGPR, thisValueGPR));
</ins><span class="cx">
</span><span class="cx"> jsValueResult(tempGPR, node);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Tools/ChangeLog (164282 => 164283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Tools/ChangeLog 2014-02-18 11:39:05 UTC (rev 164282)
+++ releases/WebKitGTK/webkit-2.2/Tools/ChangeLog 2014-02-18 11:55:49 UTC (rev 164283)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-09-13 Filip Pizlo <fpizlo@apple.com>
+
+ DFG AI assumes that ToThis can never return non-object if it is passed an object, and operationToThis will get the wrong value of isStrictMode() if there's inlining
+ https://bugs.webkit.org/show_bug.cgi?id=121330
+
+ Reviewed by Mark Hahnenberg and Oliver Hunt.
+
+ We should run tests even if they don't have expected files yet.
+
+ * Scripts/run-layout-jsc:
+
</ins><span class="cx"> 2014-01-08 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> Fix some compilation warnings
</span></span></pre>
</div>
</div>
</body>
</html>