<!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>[208574] trunk/JSTests</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/208574">208574</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-11-10 17:27:02 -0800 (Thu, 10 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix broken have-a-bad-time-with-arguments.js test.
https://bugs.webkit.org/show_bug.cgi?id=164626
Reviewed by Filip Pizlo.
But also saved a copy of the broken one as broken-have-a-bad-time-with-arguments-for-gc-testing.js
because coincidentally, it stresses the GC in ways that help reveal bugs.
* stress/broken-have-a-bad-time-with-arguments-for-gc-testing.js: Added.
(testFunction):
(warmupFunction):
(let.argsDeclIndex.in.argumentsDecls.let.indexToReturnIndex.in.indicesToReturn.let.insertElementActionIndex.in.insertElementActions.let.tierWarmupCountIndex.in.tierWarmupCounts.let.testArgsIndex.in.testArgsList.catch):
* stress/have-a-bad-time-with-arguments.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestsstresshaveabadtimewithargumentsjs">trunk/JSTests/stress/have-a-bad-time-with-arguments.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressbrokenhaveabadtimewithargumentsforgctestingjs">trunk/JSTests/stress/broken-have-a-bad-time-with-arguments-for-gc-testing.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (208573 => 208574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-11-11 00:59:53 UTC (rev 208573)
+++ trunk/JSTests/ChangeLog 2016-11-11 01:27:02 UTC (rev 208574)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-10 Mark Lam <mark.lam@apple.com>
+
+ Fix broken have-a-bad-time-with-arguments.js test.
+ https://bugs.webkit.org/show_bug.cgi?id=164626
+
+ Reviewed by Filip Pizlo.
+
+ But also saved a copy of the broken one as broken-have-a-bad-time-with-arguments-for-gc-testing.js
+ because coincidentally, it stresses the GC in ways that help reveal bugs.
+
+ * stress/broken-have-a-bad-time-with-arguments-for-gc-testing.js: Added.
+ (testFunction):
+ (warmupFunction):
+ (let.argsDeclIndex.in.argumentsDecls.let.indexToReturnIndex.in.indicesToReturn.let.insertElementActionIndex.in.insertElementActions.let.tierWarmupCountIndex.in.tierWarmupCounts.let.testArgsIndex.in.testArgsList.catch):
+ * stress/have-a-bad-time-with-arguments.js:
+
</ins><span class="cx"> 2016-11-10 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: length > offset encountered with wasm.yaml/wasm/js-api/test_Module.js.default-wasm
</span></span></pre></div>
<a id="trunkJSTestsstressbrokenhaveabadtimewithargumentsforgctestingjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/broken-have-a-bad-time-with-arguments-for-gc-testing.js (0 => 208574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/broken-have-a-bad-time-with-arguments-for-gc-testing.js (rev 0)
+++ trunk/JSTests/stress/broken-have-a-bad-time-with-arguments-for-gc-testing.js 2016-11-11 01:27:02 UTC (rev 208574)
</span><span class="lines">@@ -0,0 +1,140 @@
</span><ins>+//@ runFTLNoCJIT
+
+// Tests accessing an element in arguments before and after having a bad time.
+// This test should not crash.
+
+let verbose = false;
+
+var utilities = 'function shouldEqual(testId, actual, expected) {' + '\n' +
+ ' if (actual != expected)' + '\n' +
+ ' throw testId + ": ERROR: expect " + expected + ", actual " + actual;' + '\n' +
+ '}' + '\n';
+
+var haveABadTime = 'Object.defineProperty(Object.prototype, 20, { get() { return 20; } });' + '\n';
+
+var directArgumentsDecl = ' var args = arguments;' + '\n';
+
+var scopedArgumentsDecl = ' var args = arguments;' + '\n' +
+ ' function closure() { return x; }' + '\n';
+
+var clonedArgumentsDecl = ' "use strict";' + '\n' +
+ ' var args = arguments;' + '\n';
+
+function testFunction(argsDecl, insertElementAction, indexToReturn) {
+ var script = 'function test(x) {' + '\n' +
+ argsDecl +
+ insertElementAction +
+ ' return args[' + indexToReturn + '];' + '\n' +
+ '}' + '\n' +
+ 'noInline(test);' + '\n';
+ return script;
+}
+
+function warmupFunction(tierWarmupCount, testArgs) {
+ var script = 'function warmup() {' + '\n' +
+ ' for (var i = 0; i < ' + tierWarmupCount + '; i++) {' + '\n' +
+ ' test(' + testArgs + ');' + '\n' +
+ ' }' + '\n' +
+ '}' + '\n';
+ return script;
+}
+
+let argumentsDecls = {
+ direct: directArgumentsDecl,
+ scoped: scopedArgumentsDecl,
+ cloned: clonedArgumentsDecl
+};
+
+let indicesToReturn = {
+ inBounds: 0,
+ outOfBoundsInsertedElement: 10,
+ outOfBoundsInPrototype: 20
+};
+
+let tierWarmupCounts = {
+ llint: 1,
+ baseline: 50,
+ dfg: 1000,
+ ftl: 10000
+};
+
+let testArgsList = {
+ noArgs: {
+ args: '',
+ result: {
+ inBounds: { beforeBadTime: 'undefined', afterBadTime: 'undefined', },
+ outOfBoundsInsertedElement: { beforeBadTime: '10', afterBadTime: '10', },
+ outOfBoundsInPrototype: { beforeBadTime: 'undefined', afterBadTime: '20', },
+ }
+ },
+ someArgs: {
+ args: '1, 2, 3',
+ result: {
+ inBounds: { beforeBadTime: '1', afterBadTime: '1', },
+ outOfBoundsInsertedElement: { beforeBadTime: '10', afterBadTime: '10', },
+ outOfBoundsInPrototype: { beforeBadTime: 'undefined', afterBadTime: '20', },
+ }
+ }
+};
+
+let insertElementActions = {
+ insertElement: ' args[10] = 10;' + '\n',
+ dontInsertElement: ''
+};
+
+for (let argsDeclIndex in argumentsDecls) {
+ let argsDecl = argumentsDecls[argsDeclIndex];
+
+ for (let indexToReturnIndex in indicesToReturn) {
+ let indexToReturn = indicesToReturn[indexToReturnIndex];
+
+ for (let insertElementActionIndex in insertElementActions) {
+ let insertElementAction = insertElementActions[insertElementActionIndex];
+
+ for (let tierWarmupCountIndex in tierWarmupCounts) {
+ let tierWarmupCount = tierWarmupCounts[tierWarmupCountIndex];
+
+ for (let testArgsIndex in testArgsList) {
+ let testArgs = testArgsList[testArgsIndex].args;
+ let expectedResult = testArgsList[testArgsIndex].result[indexToReturnIndex];
+
+ if (indexToReturnIndex == 'outOfBoundsInsertedElement'
+ && insertElementActionIndex == 'dontInsertElement')
+ expectedResult = 'undefined';
+
+ let testName =
+ argsDeclIndex + '-' +
+ indexToReturnIndex + '-' +
+ insertElementActionIndex + '-' +
+ tierWarmupCountIndex + '-' +
+ testArgsIndex;
+
+
+ let script = utilities +
+ testFunction(argsDecl, insertElementAction, indexToReturn) +
+ warmupFunction(tierWarmupCount, testArgs) +
+ 'warmup()' + '\n' +
+ 'shouldEqual(10000, test(' + testArgs + '), ' + expectedResult['beforeBadTime'] + ');' + '\n';
+ haveABadTime +
+ 'shouldEqual(20000, test(' + testArgs + '), ' + expectedResult['afterBadTime'] + ');' + '\n';
+
+ if (verbose) {
+ print('Running test configuration: ' + testName);
+ print(
+ 'Test script: ====================================================\n' +
+ script +
+ '=== END script ==================================================');
+ }
+
+ try {
+ runString(script);
+ } catch (e) {
+ print('FAILED test configuration: ' + testName);
+ print('FAILED test script:\n' + script);
+ throw e;
+ }
+ }
+ }
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunkJSTestsstresshaveabadtimewithargumentsjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/have-a-bad-time-with-arguments.js (208573 => 208574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/have-a-bad-time-with-arguments.js 2016-11-11 00:59:53 UTC (rev 208573)
+++ trunk/JSTests/stress/have-a-bad-time-with-arguments.js 2016-11-11 01:27:02 UTC (rev 208574)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> testFunction(argsDecl, insertElementAction, indexToReturn) +
</span><span class="cx"> warmupFunction(tierWarmupCount, testArgs) +
</span><span class="cx"> 'warmup()' + '\n' +
</span><del>- 'shouldEqual(10000, test(' + testArgs + '), ' + expectedResult['beforeBadTime'] + ');' + '\n';
</del><ins>+ 'shouldEqual(10000, test(' + testArgs + '), ' + expectedResult['beforeBadTime'] + ');' + '\n' +
</ins><span class="cx"> haveABadTime +
</span><span class="cx"> 'shouldEqual(20000, test(' + testArgs + '), ' + expectedResult['afterBadTime'] + ');' + '\n';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>