<!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>[202846] 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/202846">202846</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-05 22:04:05 -0700 (Tue, 05 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RELEASE_ASSERT(!thisObject) in ObjCCallbackFunctionImpl::call when calling JSExport ObjC Constructor without operator new
https://bugs.webkit.org/show_bug.cgi?id=159446
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-07-05
Reviewed by Mark Lam.
Source/JavaScriptCore:
Treat ObjC JSExport init constructors like ES6 Class Constructors
and throw a TypeError when called without 'new'.
* API/ObjCCallbackFunction.mm:
(JSC::ObjCCallbackFunctionImpl::type):
(JSC::objCCallbackFunctionCallAsFunction):
When calling an init method as a function instead of construction
throw a TypeError.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
Improve error message.
* API/tests/testapi.mm:
(testObjectiveCAPIMain):
Test we get an exception when calling an ObjC constructor without 'new'.
LayoutTests:
* js/class-syntax-call-expected.txt:
* js/class-syntax-default-constructor-expected.txt:
* js/script-tests/class-syntax-call.js:
* js/script-tests/class-syntax-default-constructor.js:
Improve error message when calling a class constructor without 'new'.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsclasssyntaxcallexpectedtxt">trunk/LayoutTests/js/class-syntax-call-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsclasssyntaxdefaultconstructorexpectedtxt">trunk/LayoutTests/js/class-syntax-default-constructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsclasssyntaxcalljs">trunk/LayoutTests/js/script-tests/class-syntax-call.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsclasssyntaxdefaultconstructorjs">trunk/LayoutTests/js/script-tests/class-syntax-default-constructor.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm">trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIteststestapimm">trunk/Source/JavaScriptCore/API/tests/testapi.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202845 => 202846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-06 04:11:44 UTC (rev 202845)
+++ trunk/LayoutTests/ChangeLog 2016-07-06 05:04:05 UTC (rev 202846)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ RELEASE_ASSERT(!thisObject) in ObjCCallbackFunctionImpl::call when calling JSExport ObjC Constructor without operator new
+ https://bugs.webkit.org/show_bug.cgi?id=159446
+
+ Reviewed by Mark Lam.
+
+ * js/class-syntax-call-expected.txt:
+ * js/class-syntax-default-constructor-expected.txt:
+ * js/script-tests/class-syntax-call.js:
+ * js/script-tests/class-syntax-default-constructor.js:
+ Improve error message when calling a class constructor without 'new'.
+
</ins><span class="cx"> 2016-07-05 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Throw exceptions for invalid number of channels for ConvolverNode
</span></span></pre></div>
<a id="trunkLayoutTestsjsclasssyntaxcallexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/class-syntax-call-expected.txt (202845 => 202846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/class-syntax-call-expected.txt 2016-07-06 04:11:44 UTC (rev 202845)
+++ trunk/LayoutTests/js/class-syntax-call-expected.txt 2016-07-06 05:04:05 UTC (rev 202846)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS new A
</span><del>-PASS A():::"TypeError: Cannot call a class constructor"
</del><ins>+PASS A():::"TypeError: Cannot call a class constructor without |new|"
</ins><span class="cx"> PASS new B
</span><del>-PASS B():::"TypeError: Cannot call a class constructor"
</del><ins>+PASS B():::"TypeError: Cannot call a class constructor without |new|"
</ins><span class="cx"> PASS new (class { constructor() {} })()
</span><del>-PASS (class { constructor() {} })():::"TypeError: Cannot call a class constructor"
</del><ins>+PASS (class { constructor() {} })():::"TypeError: Cannot call a class constructor without |new|"
</ins><span class="cx"> PASS new (class extends null { constructor() { super() } })():::"TypeError: function is not a constructor (evaluating 'super()')"
</span><del>-PASS (class extends null { constructor() { super() } })():::"TypeError: Cannot call a class constructor"
</del><ins>+PASS (class extends null { constructor() { super() } })():::"TypeError: Cannot call a class constructor without |new|"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsclasssyntaxdefaultconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/class-syntax-default-constructor-expected.txt (202845 => 202846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/class-syntax-default-constructor-expected.txt 2016-07-06 04:11:44 UTC (rev 202845)
+++ trunk/LayoutTests/js/class-syntax-default-constructor-expected.txt 2016-07-06 05:04:05 UTC (rev 202846)
</span><span class="lines">@@ -4,11 +4,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS new A instanceof A
</span><del>-PASS A():::TypeError: Cannot call a class constructor
</del><ins>+PASS A():::TypeError: Cannot call a class constructor without |new|
</ins><span class="cx"> PASS A.prototype.constructor instanceof Function
</span><span class="cx"> PASS A.prototype.constructor.name:::"A"
</span><span class="cx"> PASS new B instanceof A; new B instanceof A
</span><del>-PASS B():::TypeError: Cannot call a class constructor
</del><ins>+PASS B():::TypeError: Cannot call a class constructor without |new|
</ins><span class="cx"> PASS B.prototype.constructor.name:::"B"
</span><span class="cx"> PASS A !== B
</span><span class="cx"> PASS A.prototype.constructor !== B.prototype.constructor
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsclasssyntaxcalljs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/class-syntax-call.js (202845 => 202846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/class-syntax-call.js 2016-07-06 04:11:44 UTC (rev 202845)
+++ trunk/LayoutTests/js/script-tests/class-syntax-call.js 2016-07-06 05:04:05 UTC (rev 202846)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> shouldNotThrow('new A');
</span><del>-shouldThrow('A()', '"TypeError: Cannot call a class constructor"');
</del><ins>+shouldThrow('A()', '"TypeError: Cannot call a class constructor without |new|"');
</ins><span class="cx"> shouldNotThrow('new B');
</span><del>-shouldThrow('B()', '"TypeError: Cannot call a class constructor"');
</del><ins>+shouldThrow('B()', '"TypeError: Cannot call a class constructor without |new|"');
</ins><span class="cx"> shouldNotThrow('new (class { constructor() {} })()');
</span><del>-shouldThrow('(class { constructor() {} })()', '"TypeError: Cannot call a class constructor"');
</del><ins>+shouldThrow('(class { constructor() {} })()', '"TypeError: Cannot call a class constructor without |new|"');
</ins><span class="cx"> shouldThrow('new (class extends null { constructor() { super() } })()', '"TypeError: function is not a constructor (evaluating \'super()\')"');
</span><del>-shouldThrow('(class extends null { constructor() { super() } })()', '"TypeError: Cannot call a class constructor"');
</del><ins>+shouldThrow('(class extends null { constructor() { super() } })()', '"TypeError: Cannot call a class constructor without |new|"');
</ins><span class="cx">
</span><span class="cx"> var successfullyParsed = true;
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsclasssyntaxdefaultconstructorjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/class-syntax-default-constructor.js (202845 => 202846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/class-syntax-default-constructor.js 2016-07-06 04:11:44 UTC (rev 202845)
+++ trunk/LayoutTests/js/script-tests/class-syntax-default-constructor.js 2016-07-06 05:04:05 UTC (rev 202846)
</span><span class="lines">@@ -43,11 +43,11 @@
</span><span class="cx"> class B extends A { };
</span><span class="cx">
</span><span class="cx"> shouldBeTrue('new A instanceof A');
</span><del>-shouldThrow('A()', '"TypeError: Cannot call a class constructor"');
</del><ins>+shouldThrow('A()', '"TypeError: Cannot call a class constructor without |new|"');
</ins><span class="cx"> shouldBeTrue('A.prototype.constructor instanceof Function');
</span><span class="cx"> shouldBe('A.prototype.constructor.name', '"A"');
</span><span class="cx"> shouldBeTrue('new B instanceof A; new B instanceof A');
</span><del>-shouldThrow('B()', '"TypeError: Cannot call a class constructor"');
</del><ins>+shouldThrow('B()', '"TypeError: Cannot call a class constructor without |new|"');
</ins><span class="cx"> shouldBe('B.prototype.constructor.name', '"B"');
</span><span class="cx"> shouldBeTrue('A !== B');
</span><span class="cx"> shouldBeTrue('A.prototype.constructor !== B.prototype.constructor');
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm (202845 => 202846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2016-07-06 04:11:44 UTC (rev 202845)
+++ trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2016-07-06 05:04:05 UTC (rev 202846)
</span><span class="lines">@@ -428,6 +428,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ CallbackType type() const { return m_type; }
+
</ins><span class="cx"> bool isConstructible()
</span><span class="cx"> {
</span><span class="cx"> return !!wrappedBlock() || m_type == CallbackInitMethod;
</span><span class="lines">@@ -455,6 +457,12 @@
</span><span class="cx"> ObjCCallbackFunctionImpl* impl = callback->impl();
</span><span class="cx"> JSContext *context = [JSContext contextWithJSGlobalContextRef:toGlobalRef(callback->globalObject()->globalExec())];
</span><span class="cx">
</span><ins>+ if (impl->type() == CallbackInitMethod) {
+ JSGlobalContextRef contextRef = [context JSGlobalContextRef];
+ *exception = toRef(JSC::createTypeError(toJS(contextRef), ASCIILiteral("Cannot call a class constructor without |new|")));
+ return JSValueMakeUndefined(contextRef);
+ }
+
</ins><span class="cx"> CallbackData callbackData;
</span><span class="cx"> JSValueRef result;
</span><span class="cx"> @autoreleasepool {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIteststestapimm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/testapi.mm (202845 => 202846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/testapi.mm 2016-07-06 04:11:44 UTC (rev 202845)
+++ trunk/Source/JavaScriptCore/API/tests/testapi.mm 2016-07-06 05:04:05 UTC (rev 202846)
</span><span class="lines">@@ -1334,6 +1334,7 @@
</span><span class="cx"> } \
</span><span class="cx"> })()"];
</span><span class="cx"> checkResult(@"shouldn't be able to construct ClassC", ![canConstructClassC toBool]);
</span><ins>+
</ins><span class="cx"> JSValue *canConstructClassCPrime = [context evaluateScript:@"(function() { \
</span><span class="cx"> try { \
</span><span class="cx"> (new ClassCPrime(1)); \
</span><span class="lines">@@ -1347,6 +1348,19 @@
</span><span class="cx">
</span><span class="cx"> @autoreleasepool {
</span><span class="cx"> JSContext *context = [[JSContext alloc] init];
</span><ins>+ context[@"ClassA"] = [ClassA class];
+ context.exceptionHandler = ^(JSContext *context, JSValue *exception) {
+ NSLog(@"%@", [exception toString]);
+ context.exception = exception;
+ };
+
+ checkResult(@"ObjC Constructor without 'new' pre", !context.exception);
+ [context evaluateScript:@"ClassA(42)"];
+ checkResult(@"ObjC Constructor without 'new' post", context.exception);
+ }
+
+ @autoreleasepool {
+ JSContext *context = [[JSContext alloc] init];
</ins><span class="cx"> context[@"ClassD"] = [ClassD class];
</span><span class="cx"> context[@"ClassE"] = [ClassE class];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202845 => 202846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-06 04:11:44 UTC (rev 202845)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-06 05:04:05 UTC (rev 202846)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-07-05 Joseph Pecoraro <pecoraro@apple.com>
+
+ RELEASE_ASSERT(!thisObject) in ObjCCallbackFunctionImpl::call when calling JSExport ObjC Constructor without operator new
+ https://bugs.webkit.org/show_bug.cgi?id=159446
+
+ Reviewed by Mark Lam.
+
+ Treat ObjC JSExport init constructors like ES6 Class Constructors
+ and throw a TypeError when called without 'new'.
+
+ * API/ObjCCallbackFunction.mm:
+ (JSC::ObjCCallbackFunctionImpl::type):
+ (JSC::objCCallbackFunctionCallAsFunction):
+ When calling an init method as a function instead of construction
+ throw a TypeError.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ Improve error message.
+
+ * API/tests/testapi.mm:
+ (testObjectiveCAPIMain):
+ Test we get an exception when calling an ObjC constructor without 'new'.
+
</ins><span class="cx"> 2016-07-05 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some unneeded #include "CachedCall.h".
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (202845 => 202846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2016-07-06 04:11:44 UTC (rev 202845)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2016-07-06 05:04:05 UTC (rev 202846)
</span><span class="lines">@@ -564,7 +564,7 @@
</span><span class="cx"> else
</span><span class="cx"> emitCreateThis(&m_thisRegister);
</span><span class="cx"> } else if (constructorKind() != ConstructorKind::None)
</span><del>- emitThrowTypeError("Cannot call a class constructor");
</del><ins>+ emitThrowTypeError("Cannot call a class constructor without |new|");
</ins><span class="cx"> else {
</span><span class="cx"> bool shouldEmitToThis = false;
</span><span class="cx"> if (functionNode->usesThis() || codeBlock->usesEval() || m_scopeNode->doAnyInnerArrowFunctionsUseThis() || m_scopeNode->doAnyInnerArrowFunctionsUseEval())
</span></span></pre>
</div>
</div>
</body>
</html>