<!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>[172789] branches/safari-600.1-branch</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/172789">172789</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 16:53:33 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172727">r172727</a>. <rdar://problem/18051847></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreChangeLog">branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreruntimeJSStringcpp">branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSString.cpp</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreruntimeJSStringh">branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSString.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsjsdopeyropewith16bitpropertynameexpectedtxt">branches/safari-600.1-branch/LayoutTests/js/dopey-rope-with-16-bit-propertyname-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsjsdopeyropewith16bitpropertynamehtml">branches/safari-600.1-branch/LayoutTests/js/dopey-rope-with-16-bit-propertyname.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172788 => 172789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-19 23:50:49 UTC (rev 172788)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-19 23:53:33 UTC (rev 172789)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-08-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172727. <rdar://problem/18051847>
+
+ 2014-08-18 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r168256): JSString can get 8-bit flag wrong when re-using AtomicStrings.
+ <https://webkit.org/b/133574>
+ <rdar://problem/18051847>
+
+ Add a tests that creates a 16-bit AtomicString with only 8-bit characters,
+ then tiers up into baseline JIT and uses that string as part of a rope-within-a-rope
+ and serializes that rope to get an incorrect concatenation.
+
+ Reviewed by Darin Adler.
+
+ * js/dopey-rope-with-16-bit-propertyname-expected.txt: Added.
+ * js/dopey-rope-with-16-bit-propertyname.html: Added.
+
+2014-08-19 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172709. <rdar://problem/17850158>
</span><span class="cx">
</span><span class="cx"> 2014-08-18 Andy Estes <aestes@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsjsdopeyropewith16bitpropertynameexpectedtxtfromrev172727trunkLayoutTestsjsdopeyropewith16bitpropertynameexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/js/dopey-rope-with-16-bit-propertyname-expected.txt (from rev 172727, trunk/LayoutTests/js/dopey-rope-with-16-bit-propertyname-expected.txt) (0 => 172789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/js/dopey-rope-with-16-bit-propertyname-expected.txt (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/js/dopey-rope-with-16-bit-propertyname-expected.txt 2014-08-19 23:53:33 UTC (rev 172789)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Test that a 16-bit AtomicString containing only 8-bit characters doesn't confuse the JIT into thinking it's an 8-bit AtomicString.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS globalRope is 'foo.zest'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsjsdopeyropewith16bitpropertynamehtmlfromrev172727trunkLayoutTestsjsdopeyropewith16bitpropertynamehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/js/dopey-rope-with-16-bit-propertyname.html (from rev 172727, trunk/LayoutTests/js/dopey-rope-with-16-bit-propertyname.html) (0 => 172789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/js/dopey-rope-with-16-bit-propertyname.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/js/dopey-rope-with-16-bit-propertyname.html 2014-08-19 23:53:33 UTC (rev 172789)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+
+description("Test that a 16-bit AtomicString containing only 8-bit characters doesn't confuse the JIT into thinking it's an 8-bit AtomicString.");
+
+o = {};
+
+stringWithEmoji = "zest😐";
+var test16bit = stringWithEmoji.substring(0, 4);
+
+o[test16bit] = "this makes it an AtomicString";
+
+globalRope = "";
+
+function jittable(a, b) {
+ for (var i = 0; i < 5000; ++i) {
+ poisonedRope = a + b;
+ o[poisonedRope] = 1;
+ globalRope = "foo." + poisonedRope;
+ }
+}
+
+jittable("ze", "st");
+
+shouldBe("globalRope", "'foo.zest'");
+
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog (172788 => 172789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog 2014-08-19 23:50:49 UTC (rev 172788)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog 2014-08-19 23:53:33 UTC (rev 172789)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-08-19 Dana Burkart <dburkart@apple.com>
+
+ Merge r172727. <rdar://problem/18051847>
+
+ 2014-08-18 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r168256): JSString can get 8-bit flag wrong when re-using AtomicStrings.
+ <https://webkit.org/b/133574>
+ <rdar://problem/18051847>
+
+ The optimization that resolves JSRopeStrings into an existing
+ AtomicString (to save time and memory by avoiding StringImpl allocation)
+ had a bug that it wasn't copying the 8-bit flag from the AtomicString.
+
+ This could lead to a situation where a 16-bit StringImpl containing
+ only 8-bit characters is sitting in the AtomicString table, is found
+ by the rope resolution optimization, and gives you a rope that thinks
+ it's all 8-bit, but has a fiber with 16-bit characters.
+
+ Resolving that rope will then yield incorrect results.
+
+ This was all caught by an assertion, but very hard to reproduce.
+
+ Test: js/dopey-rope-with-16-bit-propertyname.html
+
+ Reviewed by Darin Adler.
+
+ * runtime/JSString.cpp:
+ (JSC::JSRopeString::resolveRopeToAtomicString):
+ (JSC::JSRopeString::resolveRopeToExistingAtomicString):
+ * runtime/JSString.h:
+ (JSC::JSString::setIs8Bit):
+ (JSC::JSString::toExistingAtomicString):
+
</ins><span class="cx"> 2014-08-12 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172397
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreruntimeJSStringcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSString.cpp (172788 => 172789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSString.cpp 2014-08-19 23:50:49 UTC (rev 172788)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSString.cpp 2014-08-19 23:53:33 UTC (rev 172789)
</span><span class="lines">@@ -135,6 +135,7 @@
</span><span class="cx"> if (m_length > maxLengthForOnStackResolve) {
</span><span class="cx"> resolveRope(exec);
</span><span class="cx"> m_value = AtomicString(m_value);
</span><ins>+ setIs8Bit(m_value.impl()->is8Bit());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -142,10 +143,12 @@
</span><span class="cx"> LChar buffer[maxLengthForOnStackResolve];
</span><span class="cx"> resolveRopeInternal8(buffer);
</span><span class="cx"> m_value = AtomicString(buffer, m_length);
</span><ins>+ setIs8Bit(m_value.impl()->is8Bit());
</ins><span class="cx"> } else {
</span><span class="cx"> UChar buffer[maxLengthForOnStackResolve];
</span><span class="cx"> resolveRopeInternal16(buffer);
</span><span class="cx"> m_value = AtomicString(buffer, m_length);
</span><ins>+ setIs8Bit(m_value.impl()->is8Bit());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> clearFibers();
</span><span class="lines">@@ -167,6 +170,7 @@
</span><span class="cx"> resolveRope(exec);
</span><span class="cx"> if (AtomicStringImpl* existingAtomicString = AtomicString::find(m_value.impl())) {
</span><span class="cx"> m_value = *existingAtomicString;
</span><ins>+ setIs8Bit(m_value.impl()->is8Bit());
</ins><span class="cx"> clearFibers();
</span><span class="cx"> return existingAtomicString;
</span><span class="cx"> }
</span><span class="lines">@@ -178,6 +182,7 @@
</span><span class="cx"> resolveRopeInternal8(buffer);
</span><span class="cx"> if (AtomicStringImpl* existingAtomicString = AtomicString::find(buffer, m_length)) {
</span><span class="cx"> m_value = *existingAtomicString;
</span><ins>+ setIs8Bit(m_value.impl()->is8Bit());
</ins><span class="cx"> clearFibers();
</span><span class="cx"> return existingAtomicString;
</span><span class="cx"> }
</span><span class="lines">@@ -186,6 +191,7 @@
</span><span class="cx"> resolveRopeInternal16(buffer);
</span><span class="cx"> if (AtomicStringImpl* existingAtomicString = AtomicString::find(buffer, m_length)) {
</span><span class="cx"> m_value = *existingAtomicString;
</span><ins>+ setIs8Bit(m_value.impl()->is8Bit());
</ins><span class="cx"> clearFibers();
</span><span class="cx"> return existingAtomicString;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSString.h (172788 => 172789)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSString.h 2014-08-19 23:50:49 UTC (rev 172788)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSString.h 2014-08-19 23:53:33 UTC (rev 172789)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">
</span><span class="cx"> bool isRope() const { return m_value.isNull(); }
</span><span class="cx"> bool is8Bit() const { return m_flags & Is8Bit; }
</span><del>- void setIs8Bit(bool flag)
</del><ins>+ void setIs8Bit(bool flag) const
</ins><span class="cx"> {
</span><span class="cx"> if (flag)
</span><span class="cx"> m_flags |= Is8Bit;
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> bool tryHashConsLock();
</span><span class="cx"> void releaseHashConsLock();
</span><span class="cx">
</span><del>- unsigned m_flags;
</del><ins>+ mutable unsigned m_flags;
</ins><span class="cx">
</span><span class="cx"> // A string is represented either by a String or a rope of fibers.
</span><span class="cx"> unsigned m_length;
</span><span class="lines">@@ -408,6 +408,7 @@
</span><span class="cx"> return static_cast<AtomicStringImpl*>(m_value.impl());
</span><span class="cx"> if (AtomicStringImpl* existingAtomicString = AtomicString::find(m_value.impl())) {
</span><span class="cx"> m_value = *existingAtomicString;
</span><ins>+ setIs8Bit(m_value.impl()->is8Bit());
</ins><span class="cx"> return existingAtomicString;
</span><span class="cx"> }
</span><span class="cx"> return nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>