<!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>[185158] trunk/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/185158">185158</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-06-03 11:48:41 -0700 (Wed, 03 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve test coverage for changes made in 145527
https://bugs.webkit.org/show_bug.cgi?id=145578
Reviewed by Geoffrey Garen.
Added more complexity to poly-setter-combo.js stress test to create more turmoil in the
polymorphic get-by-id / put-by-id with getters and setters to exercise the code change in
https://bugs.webkit.org/show_bug.cgi?id=145527. By changing the objects that the main test
function sees, we are able to test those paths. Verified with temporary logging code.
* tests/stress/poly-setter-combo.js:
(Cons2):
(Cons3):
(Cons4):
(foo):
(test):
(runTestWithConstructors):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstresspolysettercombojs">trunk/Source/JavaScriptCore/tests/stress/poly-setter-combo.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185157 => 185158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-03 18:44:57 UTC (rev 185157)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-03 18:48:41 UTC (rev 185158)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-03 Michael Saboff <msaboff@apple.com>
+
+ Improve test coverage for changes made in 145527
+ https://bugs.webkit.org/show_bug.cgi?id=145578
+
+ Reviewed by Geoffrey Garen.
+
+ Added more complexity to poly-setter-combo.js stress test to create more turmoil in the
+ polymorphic get-by-id / put-by-id with getters and setters to exercise the code change in
+ https://bugs.webkit.org/show_bug.cgi?id=145527. By changing the objects that the main test
+ function sees, we are able to test those paths. Verified with temporary logging code.
+
+ * tests/stress/poly-setter-combo.js:
+ (Cons2):
+ (Cons3):
+ (Cons4):
+ (foo):
+ (test):
+ (runTestWithConstructors):
+
</ins><span class="cx"> 2015-06-02 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Gardening: fix broken CLoop build.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresspolysettercombojs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/poly-setter-combo.js (185157 => 185158)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/poly-setter-combo.js 2015-06-03 18:44:57 UTC (rev 185157)
+++ trunk/Source/JavaScriptCore/tests/stress/poly-setter-combo.js 2015-06-03 18:48:41 UTC (rev 185158)
</span><span class="lines">@@ -3,13 +3,31 @@
</span><span class="cx"> Cons1.prototype.f = 42;
</span><span class="cx">
</span><span class="cx"> function Cons2() {
</span><ins>+ this._values = []
</ins><span class="cx"> }
</span><span class="cx"> Cons2.prototype.__defineSetter__("f", function(value) {
</span><span class="cx"> counter++;
</span><span class="cx"> this._f = value;
</span><ins>+ this._values[value] = 1;
</ins><span class="cx"> });
</span><span class="cx"> Cons2.prototype.__defineGetter__("f", function() { return this._f; });
</span><span class="cx">
</span><ins>+function Cons3() {
+}
+Cons3.prototype.f = 42;
+Cons3.prototype.g = 43;
+
+function Cons4() {
+ this._values = []
+}
+Cons4.prototype.g = 16;
+Cons4.prototype.__defineSetter__("f", function(value) {
+ counter++;
+ this._f = value;
+ this._values[value] = 1;
+});
+Cons4.prototype.__defineGetter__("f", function() { return this._f; });
+
</ins><span class="cx"> function foo(o, value) {
</span><span class="cx"> o.f = value;
</span><span class="cx"> return o.f;
</span><span class="lines">@@ -27,17 +45,33 @@
</span><span class="cx"> throw new Error("Bad counter value: " + counter);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-for (var i = 0; i < 100000; ++i) {
- test(new Cons1(), i, counter);
- test(new Cons2(), i, counter + 1);
-
- var o = {};
- o.__defineSetter__("f", function(value) {
- this._f = value;
- counter++;
- });
- o.__defineGetter__("f", function() { return this._f; });
- test(o, i, counter + 1);
</del><ins>+function runTestWithConstructors(constructor1, constructor2) {
+ for (var i = 0; i < 5000; ++i) {
+ test(new constructor1(), i, counter);
+ test(new constructor2(), i, counter + 1);
</ins><span class="cx">
</span><del>- test({f: 42}, i, counter);
</del><ins>+ var o = {};
+ o.__defineGetter__("f", function() {
+ counter++;
+ return 84;
+ });
+ test(o, 84, counter + 1);
+
+ var o = {};
+ o.__defineSetter__("f", function(value) {
+ this._f = value;
+ counter++;
+ });
+ o.__defineGetter__("f", function() { return this._f; });
+ test(o, i, counter + 1);
+
+ test({f: 42}, i, counter);
+ }
</ins><span class="cx"> }
</span><ins>+
+for (var i = 0; i < 2; ++i) {
+ runTestWithConstructors(Cons1, Cons2);
+ runTestWithConstructors(Cons3, Cons2);
+ runTestWithConstructors(Cons1, Cons4);
+ runTestWithConstructors(Cons3, Cons4);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>