<!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>[203957] 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/203957">203957</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-07-31 17:37:14 -0700 (Sun, 31 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Should check Test262Error correctly
https://bugs.webkit.org/show_bug.cgi?id=159862
Reviewed by Saam Barati.
Test262Error in the harness does not have "name" property.
Rather than checking "name" property, peforming `instanceof` is better to check the class of the exception.
* jsc.cpp:
(checkUncaughtException):
* runtime/JSObject.h:
* tests/test262.yaml:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreteststest262yaml">trunk/Source/JavaScriptCore/tests/test262.yaml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (203956 => 203957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-31 23:36:20 UTC (rev 203956)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-01 00:37:14 UTC (rev 203957)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-07-31 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ [JSC] Should check Test262Error correctly
+ https://bugs.webkit.org/show_bug.cgi?id=159862
+
+ Reviewed by Saam Barati.
+
+ Test262Error in the harness does not have "name" property.
+ Rather than checking "name" property, peforming `instanceof` is better to check the class of the exception.
+
+ * jsc.cpp:
+ (checkUncaughtException):
+ * runtime/JSObject.h:
+ * tests/test262.yaml:
+
+2016-07-31 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> [ES6] Module binding can be exported by multiple names
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160343
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (203956 => 203957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-07-31 23:36:20 UTC (rev 203956)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-08-01 00:37:14 UTC (rev 203957)
</span><span class="lines">@@ -2039,22 +2039,28 @@
</span><span class="cx">
</span><span class="cx"> static bool checkUncaughtException(VM& vm, GlobalObject* globalObject, JSValue exception, const String& expectedExceptionName)
</span><span class="cx"> {
</span><ins>+ vm.clearException();
</ins><span class="cx"> if (!exception) {
</span><span class="cx"> printf("Expected uncaught exception with name '%s' but none was thrown\n", expectedExceptionName.utf8().data());
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSValue exceptionName = exception.get(globalObject->globalExec(), vm.propertyNames->name);
</del><ins>+ ExecState* exec = globalObject->globalExec();
+ JSValue exceptionClass = globalObject->get(exec, Identifier::fromString(exec, expectedExceptionName));
+ if (!exceptionClass.isObject() || vm.exception()) {
+ printf("Expected uncaught exception with name '%s' but given exception class is not defined\n", expectedExceptionName.utf8().data());
+ return false;
+ }
</ins><span class="cx">
</span><del>- if (JSString* exceptionNameStr = jsDynamicCast<JSString*>(exceptionName)) {
- const String& name = exceptionNameStr->value(globalObject->globalExec());
- if (name == expectedExceptionName)
- return true;
- printf("Expected uncaught exception with name '%s' but got one with name '%s'\n", expectedExceptionName.utf8().data(), name.utf8().data());
- dumpException(globalObject, exception);
</del><ins>+ bool isInstanceOfExpectedException = jsCast<JSObject*>(exceptionClass)->hasInstance(exec, exception);
+ if (vm.exception()) {
+ printf("Expected uncaught exception with name '%s' but given exception class fails performing hasInstance\n", expectedExceptionName.utf8().data());
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- printf("Expected uncaught exception with name '%s' but exception value did not have a name property\n", expectedExceptionName.utf8().data());
</del><ins>+ if (isInstanceOfExpectedException)
+ return true;
+
+ printf("Expected uncaught exception with name '%s' but exception value is not instance of this exception class\n", expectedExceptionName.utf8().data());
</ins><span class="cx"> dumpException(globalObject, exception);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (203956 => 203957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-07-31 23:36:20 UTC (rev 203956)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2016-08-01 00:37:14 UTC (rev 203957)
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> JSValue ordinaryToPrimitive(ExecState*, PreferredPrimitiveType) const;
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE bool hasInstance(ExecState*, JSValue value, JSValue hasInstanceValue);
</span><del>- bool hasInstance(ExecState*, JSValue);
</del><ins>+ JS_EXPORT_PRIVATE bool hasInstance(ExecState*, JSValue);
</ins><span class="cx"> static bool defaultHasInstance(ExecState*, JSValue, JSValue prototypeProperty);
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static void getOwnPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreteststest262yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/test262.yaml (203956 => 203957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/test262.yaml 2016-07-31 23:36:20 UTC (rev 203956)
+++ trunk/Source/JavaScriptCore/tests/test262.yaml 2016-08-01 00:37:14 UTC (rev 203957)
</span><span class="lines">@@ -896,17 +896,17 @@
</span><span class="cx"> - path: test262/test/annexB/language/comments/multi-line-html-close.js
</span><span class="cx"> cmd: runTest262 :fail, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</span><span class="cx"> - path: test262/test/annexB/language/comments/single-line-html-close-asi.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/annexB/language/comments/single-line-html-close-asi.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/annexB/language/comments/single-line-html-close.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/annexB/language/comments/single-line-html-close.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/annexB/language/comments/single-line-html-open.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], []
</ins><span class="cx"> - path: test262/test/annexB/language/comments/single-line-html-open.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../../harness/assert.js", "../../../../harness/sta.js"], [:strict]
</ins><span class="cx"> - path: test262/test/annexB/language/eval-code/direct/func-block-decl-eval-func-block-scoping.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../../../harness/assert.js", "../../../../../harness/sta.js"], []
</span><span class="cx"> - path: test262/test/annexB/language/eval-code/direct/func-block-decl-eval-func-exsting-block-fn-no-init.js
</span><span class="lines">@@ -70882,7 +70882,7 @@
</span><span class="cx"> - path: test262/test/language/module-code/eval-export-dflt-expr-cls-named.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../harness/assert.js", "../../../harness/sta.js"], [:module]
</span><span class="cx"> - path: test262/test/language/module-code/eval-export-dflt-expr-err-eval.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../harness/assert.js", "../../../harness/sta.js"], [:module]
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../harness/assert.js", "../../../harness/sta.js"], [:module]
</ins><span class="cx"> - path: test262/test/language/module-code/eval-export-dflt-expr-err-get-value.js
</span><span class="cx"> cmd: runTest262 :normal, "ReferenceError", ["../../../harness/assert.js", "../../../harness/sta.js"], [:module]
</span><span class="cx"> - path: test262/test/language/module-code/eval-export-dflt-expr-fn-anon.js
</span><span class="lines">@@ -70960,7 +70960,7 @@
</span><span class="cx"> - path: test262/test/language/module-code/eval-rqstd-order.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../harness/assert.js", "../../../harness/sta.js", "../../../harness/fnGlobalObject.js"], [:module]
</span><span class="cx"> - path: test262/test/language/module-code/eval-self-abrupt.js
</span><del>- cmd: runTest262 :fail, "Test262Error", ["../../../harness/assert.js", "../../../harness/sta.js"], [:module]
</del><ins>+ cmd: runTest262 :normal, "Test262Error", ["../../../harness/assert.js", "../../../harness/sta.js"], [:module]
</ins><span class="cx"> - path: test262/test/language/module-code/eval-self-once.js
</span><span class="cx"> cmd: runTest262 :normal, "NoException", ["../../../harness/assert.js", "../../../harness/sta.js", "../../../harness/fnGlobalObject.js"], [:module]
</span><span class="cx"> - path: test262/test/language/module-code/eval-this.js
</span></span></pre>
</div>
</div>
</body>
</html>