<!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>[208323] trunk/Source</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/208323">208323</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-11-02 21:21:30 -0700 (Wed, 02 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, fix CLoop build after <a href="http://trac.webkit.org/projects/webkit/changeset/208320">r208320</a>.
https://bugs.webkit.org/show_bug.cgi?id=162980
Source/JavaScriptCore:
Add required forward declarations.
* domjit/DOMJITHeapRange.cpp:
* domjit/DOMJITSignature.h:
* runtime/VM.h:
Source/WebCore:
Guard with ENABLE(JIT).
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
* bindings/scripts/test/JS/JSTestDOMJIT.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredomjitDOMJITHeapRangecpp">trunk/Source/JavaScriptCore/domjit/DOMJITHeapRange.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredomjitDOMJITSignatureh">trunk/Source/JavaScriptCore/domjit/DOMJITSignature.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestDOMJITcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208322 => 208323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-03 04:06:33 UTC (rev 208322)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-03 04:21:30 UTC (rev 208323)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-11-02 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ Unreviewed, fix CLoop build after r208320.
+ https://bugs.webkit.org/show_bug.cgi?id=162980
+
+ Add required forward declarations.
+
+ * domjit/DOMJITHeapRange.cpp:
+ * domjit/DOMJITSignature.h:
+ * runtime/VM.h:
+
+2016-11-02 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> [DOMJIT] Add DOMJIT::Signature
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162980
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredomjitDOMJITHeapRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/domjit/DOMJITHeapRange.cpp (208322 => 208323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/domjit/DOMJITHeapRange.cpp 2016-11-03 04:06:33 UTC (rev 208322)
+++ trunk/Source/JavaScriptCore/domjit/DOMJITHeapRange.cpp 2016-11-03 04:21:30 UTC (rev 208323)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DOMJITHeapRange.h"
</span><span class="cx">
</span><del>-#if ENABLE(JIT)
-
</del><span class="cx"> namespace JSC { namespace DOMJIT {
</span><span class="cx">
</span><span class="cx"> void HeapRange::dump(PrintStream& out) const
</span><span class="lines">@@ -36,5 +34,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoredomjitDOMJITSignatureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/domjit/DOMJITSignature.h (208322 => 208323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/domjit/DOMJITSignature.h 2016-11-03 04:06:33 UTC (rev 208322)
+++ trunk/Source/JavaScriptCore/domjit/DOMJITSignature.h 2016-11-03 04:21:30 UTC (rev 208323)
</span><span class="lines">@@ -55,10 +55,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(JIT)
</ins><span class="cx"> Ref<Patchpoint> checkDOM() const
</span><span class="cx"> {
</span><span class="cx"> return checkDOMGeneratorFunction();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> uintptr_t unsafeFunction;
</span><span class="cx"> CheckDOMGeneratorFunction* checkDOMGeneratorFunction;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (208322 => 208323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2016-11-03 04:06:33 UTC (rev 208322)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2016-11-03 04:21:30 UTC (rev 208323)
</span><span class="lines">@@ -141,6 +141,9 @@
</span><span class="cx"> namespace Profiler {
</span><span class="cx"> class Database;
</span><span class="cx"> }
</span><ins>+namespace DOMJIT {
+class Signature;
+}
</ins><span class="cx">
</span><span class="cx"> struct HashTable;
</span><span class="cx"> struct Instruction;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208322 => 208323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-03 04:06:33 UTC (rev 208322)
+++ trunk/Source/WebCore/ChangeLog 2016-11-03 04:21:30 UTC (rev 208323)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-02 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ Unreviewed, fix CLoop build after r208320.
+ https://bugs.webkit.org/show_bug.cgi?id=162980
+
+ Guard with ENABLE(JIT).
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/scripts/test/JS/JSTestDOMJIT.cpp:
+
</ins><span class="cx"> 2016-11-02 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Expand upon IndexedDB status in features.json.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (208322 => 208323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-11-03 04:06:33 UTC (rev 208322)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-11-03 04:21:30 UTC (rev 208323)
</span><span class="lines">@@ -2701,15 +2701,21 @@
</span><span class="cx"> my $domJITSignatureName = "DOMJITSignatureFor" . $interface->type->name . $codeGenerator->WK_ucfirst($function->name);
</span><span class="cx"> my $classInfo = "JS" . $interface->type->name . "::info()";
</span><span class="cx"> my $resultType = GetResultTypeFilter($interface, $function->type);
</span><del>- my $domJITSignature = "static const JSC::DOMJIT::Signature ${domJITSignatureName}((uintptr_t)${unsafeFunctionName}, DOMJIT::checkDOM<$interfaceName>, $classInfo, JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), ${resultType}";
</del><ins>+ my $domJITSignatureHeader = "static const JSC::DOMJIT::Signature ${domJITSignatureName}((uintptr_t)${unsafeFunctionName},";
+ my $domJITSignatureFooter = "$classInfo, JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), ${resultType}";
</ins><span class="cx"> foreach my $argument (@{$function->arguments}) {
</span><span class="cx"> my $type = $argument->type;
</span><span class="cx"> my $argumentType = GetArgumentTypeFilter($interface, $type);
</span><del>- $domJITSignature .= ", ${argumentType}";
</del><ins>+ $domJITSignatureFooter .= ", ${argumentType}";
</ins><span class="cx"> }
</span><ins>+ $domJITSignatureFooter .= ");";
</ins><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($function);
</span><span class="cx"> push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
</span><del>- push(@implContent, $domJITSignature . ");\n");
</del><ins>+ push(@implContent, "#if ENABLE(JIT)\n");
+ push(@implContent, "$domJITSignatureHeader DOMJIT::checkDOM<$interfaceName>, $domJITSignatureFooter\n");
+ push(@implContent, "#else\n");
+ push(@implContent, "$domJITSignatureHeader nullptr, $domJITSignatureFooter\n");
+ push(@implContent, "#endif\n");
</ins><span class="cx"> push(@implContent, "#endif\n") if $conditionalString;
</span><span class="cx"> push(@implContent, "\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestDOMJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp (208322 => 208323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp 2016-11-03 04:06:33 UTC (rev 208322)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp 2016-11-03 04:21:30 UTC (rev 208323)
</span><span class="lines">@@ -95,15 +95,35 @@
</span><span class="cx"> JSC::EncodedJSValue jsTestDOMJITConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::PropertyName);
</span><span class="cx"> bool setJSTestDOMJITConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
</span><span class="cx">
</span><ins>+#if ENABLE(JIT)
</ins><span class="cx"> static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetAttribute((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetAttribute, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLNullable<IDLDOMString>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
</span><ins>+#else
+static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetAttribute((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetAttribute, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLNullable<IDLDOMString>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
+#endif
</ins><span class="cx">
</span><ins>+#if ENABLE(JIT)
</ins><span class="cx"> static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITItem((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionItem, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLDOMString>::value, DOMJIT::IDLArgumentTypeFilter<IDLUnsignedShort>::value, DOMJIT::IDLArgumentTypeFilter<IDLUnsignedShort>::value);
</span><ins>+#else
+static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITItem((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionItem, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLDOMString>::value, DOMJIT::IDLArgumentTypeFilter<IDLUnsignedShort>::value, DOMJIT::IDLArgumentTypeFilter<IDLUnsignedShort>::value);
+#endif
</ins><span class="cx">
</span><ins>+#if ENABLE(JIT)
</ins><span class="cx"> static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITHasAttribute((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionHasAttribute, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLBoolean>::value);
</span><ins>+#else
+static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITHasAttribute((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionHasAttribute, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLBoolean>::value);
+#endif
</ins><span class="cx">
</span><ins>+#if ENABLE(JIT)
</ins><span class="cx"> static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementById((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementById, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<Element>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
</span><ins>+#else
+static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementById((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementById, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<Element>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
+#endif
</ins><span class="cx">
</span><ins>+#if ENABLE(JIT)
</ins><span class="cx"> static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementsByName((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementsByName, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<NodeList>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
</span><ins>+#else
+static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementsByName((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementsByName, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<NodeList>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
+#endif
</ins><span class="cx">
</span><span class="cx"> class JSTestDOMJITPrototype : public JSC::JSNonFinalObject {
</span><span class="cx"> public:
</span></span></pre>
</div>
</div>
</body>
</html>