<!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>[183759] trunk</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/183759">183759</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-04 12:23:24 -0700 (Mon, 04 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Extending undefined in class syntax should throw a TypeError
https://bugs.webkit.org/show_bug.cgi?id=144284
Reviewed by Darin Adler.
Source/JavaScriptCore:
The bug was caused by op_eq_null evaluating to true when compared to undefined.
Explicitly check op_eq_undefined first to detect the case where we're extending undefined.
We also had bogus test cases checked in class-syntax-extends.html. This patch also fixes them.
* bytecompiler/NodesCodegen.cpp:
(JSC::ClassExprNode::emitBytecode):
LayoutTests:
Fixed the expectation for extending undefined and removed irrelevant test cases for extending undefined
since we'll never get to instantiate these classes now.
* js/class-syntax-extends-expected.txt:
* js/script-tests/class-syntax-extends.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsclasssyntaxextendsexpectedtxt">trunk/LayoutTests/js/class-syntax-extends-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsclasssyntaxextendsjs">trunk/LayoutTests/js/script-tests/class-syntax-extends.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183758 => 183759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-04 19:22:38 UTC (rev 183758)
+++ trunk/LayoutTests/ChangeLog 2015-05-04 19:23:24 UTC (rev 183759)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-05-04 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Extending undefined in class syntax should throw a TypeError
+ https://bugs.webkit.org/show_bug.cgi?id=144284
+
+ Reviewed by Darin Adler.
+
+ Fixed the expectation for extending undefined and removed irrelevant test cases for extending undefined
+ since we'll never get to instantiate these classes now.
+
+ * js/class-syntax-extends-expected.txt:
+ * js/script-tests/class-syntax-extends.js:
+
+2015-05-04 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> ES6 classes: Invalid test for constructor property
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144278
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsclasssyntaxextendsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/class-syntax-extends-expected.txt (183758 => 183759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/class-syntax-extends-expected.txt 2015-05-04 19:22:38 UTC (rev 183758)
+++ trunk/LayoutTests/js/class-syntax-extends-expected.txt 2015-05-04 19:23:24 UTC (rev 183759)
</span><span class="lines">@@ -54,10 +54,8 @@
</span><span class="cx"> PASS x = 1; namespace = {}; namespace.A = class { constructor() { } }; try { namespace.B = class extends (namespace.A, x++) { constructor() { } } } catch (e) { } x is 2
</span><span class="cx"> PASS Object.getPrototypeOf((class { constructor () { } }).prototype) is Object.prototype
</span><span class="cx"> PASS Object.getPrototypeOf((class extends null { constructor () { super(); } }).prototype) is null
</span><del>-PASS new (class extends undefined { constructor () { this } }) threw exception ReferenceError: Cannot access uninitialized variable..
-PASS new (class extends undefined { constructor () { super(); } }) threw exception TypeError: undefined is not an object (evaluating 'super()').
-PASS x = {}; new (class extends undefined { constructor () { return x; } }) is x
-PASS y = 12; new (class extends undefined { constructor () { return y; } }) threw exception TypeError: Cannot return a non-object type in the constructor of a derived class..
</del><ins>+PASS new (class extends undefined { constructor () { this } }) threw exception TypeError: The superclass is not an object..
+PASS x = undefined; new (class extends x { constructor () { super(); } }) threw exception TypeError: The superclass is not an object..
</ins><span class="cx"> PASS class x {}; new (class extends null { constructor () { return new x; } }) instanceof x is true
</span><span class="cx"> PASS new (class extends null { constructor () { this; } }) threw exception ReferenceError: Cannot access uninitialized variable..
</span><span class="cx"> PASS new (class extends null { constructor () { super(); } }) threw exception TypeError: undefined is not an object (evaluating 'super()').
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsclasssyntaxextendsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/class-syntax-extends.js (183758 => 183759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/class-syntax-extends.js 2015-05-04 19:22:38 UTC (rev 183758)
+++ trunk/LayoutTests/js/script-tests/class-syntax-extends.js 2015-05-04 19:23:24 UTC (rev 183759)
</span><span class="lines">@@ -70,10 +70,8 @@
</span><span class="cx">
</span><span class="cx"> shouldBe('Object.getPrototypeOf((class { constructor () { } }).prototype)', 'Object.prototype');
</span><span class="cx"> shouldBe('Object.getPrototypeOf((class extends null { constructor () { super(); } }).prototype)', 'null');
</span><del>-shouldThrow('new (class extends undefined { constructor () { this } })', '"ReferenceError: Cannot access uninitialized variable."');
-shouldThrow('new (class extends undefined { constructor () { super(); } })', '"TypeError: undefined is not an object (evaluating \'super()\')"');
-shouldBe('x = {}; new (class extends undefined { constructor () { return x; } })', 'x');
-shouldThrow('y = 12; new (class extends undefined { constructor () { return y; } })', '"TypeError: Cannot return a non-object type in the constructor of a derived class."');
</del><ins>+shouldThrow('new (class extends undefined { constructor () { this } })', '"TypeError: The superclass is not an object."');
+shouldThrow('x = undefined; new (class extends x { constructor () { super(); } })', '"TypeError: The superclass is not an object."');
</ins><span class="cx"> shouldBeTrue ('class x {}; new (class extends null { constructor () { return new x; } }) instanceof x');
</span><span class="cx"> shouldThrow('new (class extends null { constructor () { this; } })', '"ReferenceError: Cannot access uninitialized variable."');
</span><span class="cx"> shouldThrow('new (class extends null { constructor () { super(); } })', '"TypeError: undefined is not an object (evaluating \'super()\')"');
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183758 => 183759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-04 19:22:38 UTC (rev 183758)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-04 19:23:24 UTC (rev 183759)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-05-04 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Extending undefined in class syntax should throw a TypeError
+ https://bugs.webkit.org/show_bug.cgi?id=144284
+
+ Reviewed by Darin Adler.
+
+ The bug was caused by op_eq_null evaluating to true when compared to undefined.
+ Explicitly check op_eq_undefined first to detect the case where we're extending undefined.
+
+ We also had bogus test cases checked in class-syntax-extends.html. This patch also fixes them.
+
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::ClassExprNode::emitBytecode):
+
+2015-05-04 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> new super should be a syntax error
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144282
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (183758 => 183759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-05-04 19:22:38 UTC (rev 183758)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-05-04 19:23:24 UTC (rev 183759)
</span><span class="lines">@@ -2937,12 +2937,17 @@
</span><span class="cx"> generator.emitLoad(protoParent.get(), jsNull());
</span><span class="cx">
</span><span class="cx"> RefPtr<RegisterID> tempRegister = generator.newTemporary();
</span><ins>+
+ // FIXME: Throw TypeError if it's a generator function.
+ RefPtr<Label> superclassIsUndefinedLabel = generator.newLabel();
+ generator.emitJumpIfTrue(generator.emitIsUndefined(tempRegister.get(), superclass.get()), superclassIsUndefinedLabel.get());
+
</ins><span class="cx"> RefPtr<Label> superclassIsNullLabel = generator.newLabel();
</span><span class="cx"> generator.emitJumpIfTrue(generator.emitUnaryOp(op_eq_null, tempRegister.get(), superclass.get()), superclassIsNullLabel.get());
</span><span class="cx">
</span><del>- // FIXME: Throw TypeError if it's a generator function.
</del><span class="cx"> RefPtr<Label> superclassIsObjectLabel = generator.newLabel();
</span><span class="cx"> generator.emitJumpIfTrue(generator.emitIsObject(tempRegister.get(), superclass.get()), superclassIsObjectLabel.get());
</span><ins>+ generator.emitLabel(superclassIsUndefinedLabel.get());
</ins><span class="cx"> generator.emitThrowTypeError(ASCIILiteral("The superclass is not an object."));
</span><span class="cx"> generator.emitLabel(superclassIsObjectLabel.get());
</span><span class="cx"> generator.emitGetById(protoParent.get(), superclass.get(), generator.propertyNames().prototype);
</span></span></pre>
</div>
</div>
</body>
</html>