<!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>[186312] 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/186312">186312</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-07-06 01:10:26 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Promise-returning functions should reject promises if the callee is not of the expected type
https://bugs.webkit.org/show_bug.cgi?id=146585
Reviewed by Darin Adler.
Source/WebCore:
Updated binding generator to reject promise in case the casting of the thisValue is not working properly
(i.e. the callee is not wrapping a DOM object of the expected class.
Covered by rebased test and binding expectations.
* bindings/js/JSDOMPromise.h:
(WebCore::callPromiseFunction): Removed wrapper class parameter.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
* bindings/scripts/test/JS/JSTestObj.cpp: Updated binding expectations.
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunction):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionPromise):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgument):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithException):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithExceptionPromise):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgument):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise):
LayoutTests:
* streams/reference-implementation/brand-checks-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsstreamsreferenceimplementationbrandchecksexpectedtxt">trunk/LayoutTests/streams/reference-implementation/brand-checks-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromiseh">trunk/Source/WebCore/bindings/js/JSDOMPromise.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186311 => 186312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-06 08:08:42 UTC (rev 186311)
+++ trunk/LayoutTests/ChangeLog 2015-07-06 08:10:26 UTC (rev 186312)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-07-06 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Promise-returning functions should reject promises if the callee is not of the expected type
+ https://bugs.webkit.org/show_bug.cgi?id=146585
+
+ Reviewed by Darin Adler.
+
+ * streams/reference-implementation/brand-checks-expected.txt:
+
</ins><span class="cx"> 2015-07-05 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Update toLength / toInteger names in control profiler test results
</span></span></pre></div>
<a id="trunkLayoutTestsstreamsreferenceimplementationbrandchecksexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/streams/reference-implementation/brand-checks-expected.txt (186311 => 186312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/streams/reference-implementation/brand-checks-expected.txt 2015-07-06 08:08:42 UTC (rev 186311)
+++ trunk/LayoutTests/streams/reference-implementation/brand-checks-expected.txt 2015-07-06 08:10:26 UTC (rev 186312)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> FAIL ReadableStream.prototype.pipeThrough works generically on its this and its arguments Can only call ReadableStream.pipeThrough on instances of ReadableStream
</span><span class="cx"> PASS ReadableStreamReader enforces a brand check on its argument
</span><span class="cx"> FAIL ReadableStreamReader.prototype.closed enforces a brand check undefined is not an object (evaluating 'Object.getOwnPropertyDescriptor(obj, getterName).get')
</span><del>-FAIL ReadableStreamReader.prototype.cancel enforces a brand check Can only call ReadableStreamReader.cancel on instances of ReadableStreamReader
</del><ins>+PASS ReadableStreamReader.prototype.cancel enforces a brand check
</ins><span class="cx"> FAIL ReadableStreamReader.prototype.read enforces a brand check Can only call ReadableStreamReader.read on instances of ReadableStreamReader
</span><span class="cx"> FAIL ReadableStreamReader.prototype.read enforces a brand check Can only call ReadableStreamReader.read on instances of ReadableStreamReader
</span><span class="cx"> PASS ReadableStreamReader.prototype.releaseLock enforces a brand check
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186311 => 186312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-06 08:08:42 UTC (rev 186311)
+++ trunk/Source/WebCore/ChangeLog 2015-07-06 08:10:26 UTC (rev 186312)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-07-06 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Promise-returning functions should reject promises if the callee is not of the expected type
+ https://bugs.webkit.org/show_bug.cgi?id=146585
+
+ Reviewed by Darin Adler.
+
+ Updated binding generator to reject promise in case the casting of the thisValue is not working properly
+ (i.e. the callee is not wrapping a DOM object of the expected class.
+
+ Covered by rebased test and binding expectations.
+
+ * bindings/js/JSDOMPromise.h:
+ (WebCore::callPromiseFunction): Removed wrapper class parameter.
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/scripts/test/JS/JSTestObj.cpp: Updated binding expectations.
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunction):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionPromise):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgument):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithException):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithExceptionPromise):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgument):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise):
+
</ins><span class="cx"> 2015-07-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Current page's scroll position is lost when transferring sessionState from one view to another
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (186311 => 186312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2015-07-06 08:08:42 UTC (rev 186311)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2015-07-06 08:10:26 UTC (rev 186312)
</span><span class="lines">@@ -58,15 +58,15 @@
</span><span class="cx">
</span><span class="cx"> void rejectPromiseWithExceptionIfAny(JSC::ExecState&, JSDOMGlobalObject&, JSC::JSPromiseDeferred&);
</span><span class="cx">
</span><del>-template<typename JSClassName>
-inline JSC::JSValue callPromiseFunction(JSC::ExecState& state, JSClassName& wrapper, JSC::EncodedJSValue promiseFunction(JSC::ExecState*, JSClassName*, JSC::JSPromiseDeferred*))
</del><ins>+inline JSC::JSValue callPromiseFunction(JSC::ExecState& state, JSC::EncodedJSValue promiseFunction(JSC::ExecState*, JSC::JSPromiseDeferred*))
</ins><span class="cx"> {
</span><del>- JSC::JSPromiseDeferred* promiseDeferred = JSC::JSPromiseDeferred::create(&state, wrapper.globalObject());
- promiseFunction(&state, &wrapper, promiseDeferred);
</del><ins>+ JSDOMGlobalObject& globalObject = *JSC::jsCast<JSDOMGlobalObject*>(state.lexicalGlobalObject());
+ JSC::JSPromiseDeferred& promiseDeferred = *JSC::JSPromiseDeferred::create(&state, &globalObject);
+ promiseFunction(&state, &promiseDeferred);
</ins><span class="cx">
</span><del>- rejectPromiseWithExceptionIfAny(state, *wrapper.globalObject(), *promiseDeferred);
</del><ins>+ rejectPromiseWithExceptionIfAny(state, globalObject, promiseDeferred);
</ins><span class="cx"> ASSERT(!state.hadException());
</span><del>- return promiseDeferred->promise();
</del><ins>+ return promiseDeferred.promise();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename Value, typename Error>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (186311 => 186312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-07-06 08:08:42 UTC (rev 186311)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-07-06 08:10:26 UTC (rev 186312)
</span><span class="lines">@@ -2799,15 +2799,14 @@
</span><span class="cx"> if (IsReturningPromise($function) && !$isCustom) {
</span><span class="cx"> AddToImplIncludes("JSDOMPromise.h");
</span><span class="cx">
</span><del>- push(@implContent, "static inline EncodedJSValue ${functionName}Promise(ExecState*, " . $className . "*, JSPromiseDeferred*);\n");
</del><ins>+ push(@implContent, "static inline EncodedJSValue ${functionName}Promise(ExecState*, JSPromiseDeferred*);\n");
</ins><span class="cx"> push(@implContent, "EncodedJSValue JSC_HOST_CALL ${functionName}(ExecState* exec)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx">
</span><del>- GenerateFunctionCastedThis($interface, $interfaceName, $className, $function);
- push(@implContent, " return JSValue::encode(callPromiseFunction(*exec, *castedThis, ${functionName}Promise));\n");
</del><ins>+ push(@implContent, " return JSValue::encode(callPromiseFunction(*exec, ${functionName}Promise));\n");
</ins><span class="cx">
</span><span class="cx"> push(@implContent, "}\n");
</span><del>- push(@implContent, "\nstatic inline EncodedJSValue ${functionName}Promise(ExecState* exec, " . $className . "* castedThis, JSPromiseDeferred* promiseDeferred)\n");
</del><ins>+ push(@implContent, "\nstatic inline EncodedJSValue ${functionName}Promise(ExecState* exec, JSPromiseDeferred* promiseDeferred)\n");
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> push(@implContent, "EncodedJSValue JSC_HOST_CALL ${functionName}(ExecState* exec)\n");
</span><span class="lines">@@ -2831,7 +2830,7 @@
</span><span class="cx"> GenerateImplementationFunctionCall($function, $functionString, " ", $svgPropertyType, $interfaceName);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- GenerateFunctionCastedThis($interface, $interfaceName, $className, $function) if not (IsReturningPromise($function) && !$isCustom);
</del><ins>+ GenerateFunctionCastedThis($interface, $interfaceName, $className, $function);
</ins><span class="cx">
</span><span class="cx"> if ($interface->extendedAttributes->{"CheckSecurity"} and
</span><span class="cx"> !$function->signature->extendedAttributes->{"DoNotCheckSecurity"}) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (186311 => 186312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-07-06 08:08:42 UTC (rev 186311)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-07-06 08:10:26 UTC (rev 186312)
</span><span class="lines">@@ -4523,37 +4523,37 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionPromise(ExecState*, JSTestObj*, JSPromiseDeferred*);
</del><ins>+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionPromise(ExecState*, JSPromiseDeferred*);
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunction(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ return JSValue::encode(callPromiseFunction(*exec, jsTestObjPrototypeFunctionTestPromiseFunctionPromise));
+}
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionPromise(ExecState* exec, JSPromiseDeferred* promiseDeferred)
+{
</ins><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
</span><span class="cx"> if (UNLIKELY(!castedThis))
</span><span class="cx"> return throwThisTypeError(*exec, "TestObj", "testPromiseFunction");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><del>- return JSValue::encode(callPromiseFunction(*exec, *castedThis, jsTestObjPrototypeFunctionTestPromiseFunctionPromise));
-}
-
-static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionPromise(ExecState* exec, JSTestObj* castedThis, JSPromiseDeferred* promiseDeferred)
-{
</del><span class="cx"> auto& impl = castedThis->impl();
</span><span class="cx"> impl.testPromiseFunction(DeferredWrapper(exec, castedThis->globalObject(), promiseDeferred));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise(ExecState*, JSTestObj*, JSPromiseDeferred*);
</del><ins>+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise(ExecState*, JSPromiseDeferred*);
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgument(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ return JSValue::encode(callPromiseFunction(*exec, jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise));
+}
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise(ExecState* exec, JSPromiseDeferred* promiseDeferred)
+{
</ins><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
</span><span class="cx"> if (UNLIKELY(!castedThis))
</span><span class="cx"> return throwThisTypeError(*exec, "TestObj", "testPromiseFunctionWithFloatArgument");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><del>- return JSValue::encode(callPromiseFunction(*exec, *castedThis, jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise));
-}
-
-static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise(ExecState* exec, JSTestObj* castedThis, JSPromiseDeferred* promiseDeferred)
-{
</del><span class="cx"> auto& impl = castedThis->impl();
</span><span class="cx"> if (UNLIKELY(exec->argumentCount() < 1))
</span><span class="cx"> return throwVMError(exec, createNotEnoughArgumentsError(exec));
</span><span class="lines">@@ -4568,19 +4568,19 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithExceptionPromise(ExecState*, JSTestObj*, JSPromiseDeferred*);
</del><ins>+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithExceptionPromise(ExecState*, JSPromiseDeferred*);
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunctionWithException(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ return JSValue::encode(callPromiseFunction(*exec, jsTestObjPrototypeFunctionTestPromiseFunctionWithExceptionPromise));
+}
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithExceptionPromise(ExecState* exec, JSPromiseDeferred* promiseDeferred)
+{
</ins><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
</span><span class="cx"> if (UNLIKELY(!castedThis))
</span><span class="cx"> return throwThisTypeError(*exec, "TestObj", "testPromiseFunctionWithException");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><del>- return JSValue::encode(callPromiseFunction(*exec, *castedThis, jsTestObjPrototypeFunctionTestPromiseFunctionWithExceptionPromise));
-}
-
-static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithExceptionPromise(ExecState* exec, JSTestObj* castedThis, JSPromiseDeferred* promiseDeferred)
-{
</del><span class="cx"> auto& impl = castedThis->impl();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> impl.testPromiseFunctionWithException(DeferredWrapper(exec, castedThis->globalObject(), promiseDeferred), ec);
</span><span class="lines">@@ -4588,19 +4588,19 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise(ExecState*, JSTestObj*, JSPromiseDeferred*);
</del><ins>+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise(ExecState*, JSPromiseDeferred*);
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgument(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ return JSValue::encode(callPromiseFunction(*exec, jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise));
+}
+
+static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise(ExecState* exec, JSPromiseDeferred* promiseDeferred)
+{
</ins><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(thisValue);
</span><span class="cx"> if (UNLIKELY(!castedThis))
</span><span class="cx"> return throwThisTypeError(*exec, "TestObj", "testPromiseFunctionWithOptionalIntArgument");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><del>- return JSValue::encode(callPromiseFunction(*exec, *castedThis, jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise));
-}
-
-static inline EncodedJSValue jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise(ExecState* exec, JSTestObj* castedThis, JSPromiseDeferred* promiseDeferred)
-{
</del><span class="cx"> auto& impl = castedThis->impl();
</span><span class="cx">
</span><span class="cx"> size_t argsCount = exec->argumentCount();
</span></span></pre>
</div>
</div>
</body>
</html>