<!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>[203419] 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/203419">203419</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-07-19 13:52:48 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebCore-7602.1.42 fails to build: error: private field 'm_vm' is not used
https://bugs.webkit.org/show_bug.cgi?id=159944
rdar://problem/27420308
Reviewed by Dan Bernstein.
Wrap the m_vm declaration and initialization in conditional guards.
* Scripts/builtins/builtins_generate_internals_wrapper_header.py:
(generate_members):
* Scripts/builtins/builtins_generate_internals_wrapper_implementation.py:
(BuiltinsInternalsWrapperImplementationGenerator.generate_constructor):
Add guards.
* Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
Update expected results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_internals_wrapper_headerpy">trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_internals_wrapper_implementationpy">trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreArbitraryConditionalGuardSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedInternalBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreUnguardedBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCorexmlCasingTestSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (203418 => 203419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-19 20:43:49 UTC (rev 203418)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-19 20:52:48 UTC (rev 203419)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-07-19 Anders Carlsson <andersca@apple.com>
+
+ WebCore-7602.1.42 fails to build: error: private field 'm_vm' is not used
+ https://bugs.webkit.org/show_bug.cgi?id=159944
+ rdar://problem/27420308
+
+ Reviewed by Dan Bernstein.
+
+ Wrap the m_vm declaration and initialization in conditional guards.
+
+ * Scripts/builtins/builtins_generate_internals_wrapper_header.py:
+ (generate_members):
+ * Scripts/builtins/builtins_generate_internals_wrapper_implementation.py:
+ (BuiltinsInternalsWrapperImplementationGenerator.generate_constructor):
+ Add guards.
+
+ * Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
+ Update expected results.
+
</ins><span class="cx"> 2016-07-19 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r203348-r203368): ASSERTION FAILED: from.isCell() && from.asCell()->JSCell::inherits(std::remove_pointer<To>::type::info())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_internals_wrapper_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py (203418 => 203419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py 2016-07-19 20:43:49 UTC (rev 203418)
+++ trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_header.py 2016-07-19 20:52:48 UTC (rev 203419)
</span><span class="lines">@@ -108,7 +108,8 @@
</span><span class="cx"> return '\n'.join(lines)
</span><span class="cx">
</span><span class="cx"> def generate_members(self):
</span><del>- lines = [" JSC::VM& m_vm;"]
</del><ins>+ guards = set([object.annotations.get('conditional') for object in self.internals if 'conditional' in object.annotations])
+ lines = [BuiltinsGenerator.wrap_with_guard(" || ".join(guards), " JSC::VM& m_vm;")]
</ins><span class="cx"> for object in self.internals:
</span><span class="cx"> member = " %s %s;" % (self.member_type(object), self.member_name(object))
</span><span class="cx"> lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), member))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_internals_wrapper_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py (203418 => 203419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py 2016-07-19 20:43:49 UTC (rev 203418)
+++ trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py 2016-07-19 20:52:48 UTC (rev 203419)
</span><span class="lines">@@ -97,12 +97,15 @@
</span><span class="cx"> return WK_ucfirst(object.object_name) + "BuiltinFunctions"
</span><span class="cx">
</span><span class="cx"> def generate_constructor(self):
</span><ins>+ guards = set([object.annotations.get('conditional') for object in self.internals if 'conditional' in object.annotations])
</ins><span class="cx"> lines = ["JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)",
</span><del>- " : m_vm(vm)"]
</del><ins>+ BuiltinsGenerator.wrap_with_guard(" || ".join(guards), " : m_vm(vm)")]
</ins><span class="cx"> for object in self.internals:
</span><span class="cx"> initializer = " , %s(m_vm)" % self.member_name(object)
</span><span class="cx"> lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), initializer))
</span><del>- lines.append("{\n}\n")
</del><ins>+ lines.append("{")
+ lines.append(" UNUSED_PARAM(vm);")
+ lines.append("}\n")
</ins><span class="cx"> return '\n'.join(lines)
</span><span class="cx">
</span><span class="cx"> def property_macro(self, object):
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreArbitraryConditionalGuardSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result (203418 => 203419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2016-07-19 20:43:49 UTC (rev 203418)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2016-07-19 20:52:48 UTC (rev 203419)
</span><span class="lines">@@ -391,6 +391,7 @@
</span><span class="cx"> JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
</span><span class="cx"> : m_vm(vm)
</span><span class="cx"> {
</span><ins>+ UNUSED_PARAM(vm);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result (203418 => 203419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2016-07-19 20:43:49 UTC (rev 203418)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2016-07-19 20:52:48 UTC (rev 203419)
</span><span class="lines">@@ -391,6 +391,7 @@
</span><span class="cx"> JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
</span><span class="cx"> : m_vm(vm)
</span><span class="cx"> {
</span><ins>+ UNUSED_PARAM(vm);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedInternalBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result (203418 => 203419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2016-07-19 20:43:49 UTC (rev 203418)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2016-07-19 20:52:48 UTC (rev 203419)
</span><span class="lines">@@ -379,7 +379,9 @@
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if ENABLE(STREAMS_API)
</ins><span class="cx"> JSC::VM& m_vm;
</span><ins>+#endif // ENABLE(STREAMS_API)
</ins><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> GuardedInternalBuiltinBuiltinFunctions m_guardedInternalBuiltin;
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="lines">@@ -431,11 +433,14 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
</span><ins>+#if ENABLE(STREAMS_API)
</ins><span class="cx"> : m_vm(vm)
</span><ins>+#endif // ENABLE(STREAMS_API)
</ins><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> , m_guardedInternalBuiltin(m_vm)
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="cx"> {
</span><ins>+ UNUSED_PARAM(vm);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreUnguardedBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result (203418 => 203419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2016-07-19 20:43:49 UTC (rev 203418)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2016-07-19 20:52:48 UTC (rev 203419)
</span><span class="lines">@@ -376,6 +376,7 @@
</span><span class="cx"> JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
</span><span class="cx"> : m_vm(vm)
</span><span class="cx"> {
</span><ins>+ UNUSED_PARAM(vm);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCorexmlCasingTestSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result (203418 => 203419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2016-07-19 20:43:49 UTC (rev 203418)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2016-07-19 20:52:48 UTC (rev 203419)
</span><span class="lines">@@ -430,7 +430,9 @@
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if ENABLE(STREAMS_API)
</ins><span class="cx"> JSC::VM& m_vm;
</span><ins>+#endif // ENABLE(STREAMS_API)
</ins><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> XMLCasingTestBuiltinFunctions m_xmlCasingTest;
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="lines">@@ -482,11 +484,14 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
</span><ins>+#if ENABLE(STREAMS_API)
</ins><span class="cx"> : m_vm(vm)
</span><ins>+#endif // ENABLE(STREAMS_API)
</ins><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> , m_xmlCasingTest(m_vm)
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="cx"> {
</span><ins>+ UNUSED_PARAM(vm);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
</span></span></pre>
</div>
</div>
</body>
</html>