<!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>[197846] releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore</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/197846">197846</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-09 00:46:47 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197640">r197640</a> - [JSC] RegExp#lastIndex should handle writable attribute when defining in defineOwnProperty path
https://bugs.webkit.org/show_bug.cgi?id=155093
Reviewed by Filip Pizlo.
Before this patch, `setLastIndex(ExecState* exec, size_t lastIndex)` always overwrites the existing value
regardless of writable attribute.
And when defining RegExp#lastIndex in defineOwnProperty, we need to define the value first
before making the attribute readonly. After changing the writable attribute, we cannot define the value.
* runtime/RegExpObject.cpp:
(JSC::RegExpObject::defineOwnProperty):
* runtime/RegExpObject.h:
(JSC::RegExpObject::setLastIndex):
* tests/stress/regexp-last-index-writable.js: Added.
(shouldBe):
(shouldThrow):
(regExpLastIndex):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeRegExpObjectcpp">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeRegExpObjecth">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpObject.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoretestsstressregexplastindexwritablejs">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/tests/stress/regexp-last-index-writable.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog (197845 => 197846)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-03-09 08:32:50 UTC (rev 197845)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-03-09 08:46:47 UTC (rev 197846)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-03-06 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC] RegExp#lastIndex should handle writable attribute when defining in defineOwnProperty path
+ https://bugs.webkit.org/show_bug.cgi?id=155093
+
+ Reviewed by Filip Pizlo.
+
+ Before this patch, `setLastIndex(ExecState* exec, size_t lastIndex)` always overwrites the existing value
+ regardless of writable attribute.
+ And when defining RegExp#lastIndex in defineOwnProperty, we need to define the value first
+ before making the attribute readonly. After changing the writable attribute, we cannot define the value.
+
+ * runtime/RegExpObject.cpp:
+ (JSC::RegExpObject::defineOwnProperty):
+ * runtime/RegExpObject.h:
+ (JSC::RegExpObject::setLastIndex):
+ * tests/stress/regexp-last-index-writable.js: Added.
+ (shouldBe):
+ (shouldThrow):
+ (regExpLastIndex):
+
</ins><span class="cx"> 2016-03-05 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> The most aggressive form of RegExpTest/RegExpExec should speculate more aggressively than just cell
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeRegExpObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpObject.cpp (197845 => 197846)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpObject.cpp 2016-03-09 08:32:50 UTC (rev 197845)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpObject.cpp 2016-03-09 08:46:47 UTC (rev 197846)
</span><span class="lines">@@ -127,10 +127,10 @@
</span><span class="cx"> return reject(exec, shouldThrow, "Attempting to change value of a readonly property.");
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+ if (descriptor.value())
+ regExp->setLastIndex(exec, descriptor.value(), false);
</ins><span class="cx"> if (descriptor.writablePresent() && !descriptor.writable())
</span><span class="cx"> regExp->m_lastIndexIsWritable = false;
</span><del>- if (descriptor.value())
- regExp->setLastIndex(exec, descriptor.value(), false);
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeRegExpObjecth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpObject.h (197845 => 197846)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpObject.h 2016-03-09 08:32:50 UTC (rev 197845)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpObject.h 2016-03-09 08:46:47 UTC (rev 197846)
</span><span class="lines">@@ -41,20 +41,25 @@
</span><span class="cx"> void setRegExp(VM& vm, RegExp* r) { m_regExp.set(vm, this, r); }
</span><span class="cx"> RegExp* regExp() const { return m_regExp.get(); }
</span><span class="cx">
</span><del>- void setLastIndex(ExecState* exec, size_t lastIndex)
</del><ins>+ bool setLastIndex(ExecState* exec, size_t lastIndex)
</ins><span class="cx"> {
</span><del>- m_lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
- if (LIKELY(m_lastIndexIsWritable))
</del><ins>+ if (LIKELY(m_lastIndexIsWritable)) {
</ins><span class="cx"> m_lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
</span><del>- else
- throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
</del><ins>+ return true;
+ }
+ throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
+ return false;
</ins><span class="cx"> }
</span><del>- void setLastIndex(ExecState* exec, JSValue lastIndex, bool shouldThrow)
</del><ins>+ bool setLastIndex(ExecState* exec, JSValue lastIndex, bool shouldThrow)
</ins><span class="cx"> {
</span><del>- if (LIKELY(m_lastIndexIsWritable))
</del><ins>+ if (LIKELY(m_lastIndexIsWritable)) {
</ins><span class="cx"> m_lastIndex.set(exec->vm(), this, lastIndex);
</span><del>- else if (shouldThrow)
</del><ins>+ return true;
+ }
+
+ if (shouldThrow)
</ins><span class="cx"> throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
</span><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> JSValue getLastIndex() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoretestsstressregexplastindexwritablejs"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/tests/stress/regexp-last-index-writable.js (0 => 197846)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/tests/stress/regexp-last-index-writable.js (rev 0)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/tests/stress/regexp-last-index-writable.js 2016-03-09 08:46:47 UTC (rev 197846)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+function shouldBe(actual, expected) {
+ if (actual !== expected)
+ throw new Error('bad value: ' + actual);
+}
+
+function shouldThrow(func, message) {
+ var error = null;
+ try {
+ func();
+ } catch (e) {
+ error = e;
+ }
+ if (!error)
+ throw new Error("not thrown.");
+ if (String(error) !== message)
+ throw new Error("bad error: " + String(error));
+}
+
+(function regExpLastIndex() {
+ var regexp = new RegExp('Cocoa');
+ regexp.lastIndex = 'Hello';
+ shouldBe(Reflect.get(regexp, 'lastIndex'), 'Hello');
+ regexp.lastIndex = 42;
+ shouldBe(Reflect.get(regexp, 'lastIndex'), 42);
+
+ regexp.lastIndex = "Hello";
+ shouldBe(Reflect.get(regexp, 'lastIndex'), 'Hello');
+
+ shouldBe(Reflect.defineProperty(regexp, 'lastIndex', {
+ value: 42,
+ writable: false
+ }), true);
+ shouldBe(Reflect.get(regexp, 'lastIndex'), 42);
+ shouldThrow(function () {
+ 'use strict';
+ regexp.lastIndex = 'NG';
+ }, `TypeError: Attempted to assign to readonly property.`);
+ shouldBe(Reflect.get(regexp, 'lastIndex'), 42);
+
+ shouldThrow(function () {
+ 'use strict';
+ regexp.lastIndex = "NG";
+ }, `TypeError: Attempted to assign to readonly property.`);
+
+ shouldThrow(function () {
+ 'use strict';
+ Object.defineProperty(regexp, 'lastIndex', {
+ value: 'NG'
+ });
+ }, `TypeError: Attempting to change value of a readonly property.`);
+ shouldBe(Reflect.get(regexp, 'lastIndex'), 42);
+}());
</ins></span></pre>
</div>
</div>
</body>
</html>