<!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>[178882] 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/178882">178882</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-21 18:06:33 -0800 (Wed, 21 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>BytecodeGenerator shouldn't expose all of its member variables
https://bugs.webkit.org/show_bug.cgi?id=140752

Reviewed by Mark Lam.

Added &quot;private:&quot; and removed unused data members as detected by clang.

* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
* bytecompiler/BytecodeGenerator.h:
(JSC::BytecodeGenerator::lastOpcodeID): Added. Used in BinaryOpNode::emitBytecode.
* bytecompiler/NodesCodegen.cpp:
(JSC::BinaryOpNode::emitBytecode):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178881 => 178882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-01-22 02:06:22 UTC (rev 178881)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-01-22 02:06:33 UTC (rev 178882)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-21  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        BytecodeGenerator shouldn't expose all of its member variables
+        https://bugs.webkit.org/show_bug.cgi?id=140752
+
+        Reviewed by Mark Lam.
+
+        Added &quot;private:&quot; and removed unused data members as detected by clang.
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::BytecodeGenerator):
+        * bytecompiler/BytecodeGenerator.h:
+        (JSC::BytecodeGenerator::lastOpcodeID): Added. Used in BinaryOpNode::emitBytecode.
+        * bytecompiler/NodesCodegen.cpp:
+        (JSC::BinaryOpNode::emitBytecode):
+
</ins><span class="cx"> 2015-01-21  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: ASSERT expanding objects in console PrimitiveBindingTraits&lt;T&gt;::assertValueHasExpectedType
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (178881 => 178882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp        2015-01-22 02:06:22 UTC (rev 178881)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp        2015-01-22 02:06:33 UTC (rev 178882)
</span><span class="lines">@@ -173,7 +173,6 @@
</span><span class="cx">     , m_localScopeDepth(0)
</span><span class="cx">     , m_codeType(GlobalCode)
</span><span class="cx">     , m_nextConstantOffset(0)
</span><del>-    , m_globalConstantIndex(0)
</del><span class="cx">     , m_firstLazyFunction(0)
</span><span class="cx">     , m_lastLazyFunction(0)
</span><span class="cx">     , m_staticPropertyAnalyzer(&amp;m_instructions)
</span><span class="lines">@@ -221,7 +220,6 @@
</span><span class="cx">     , m_localScopeDepth(0)
</span><span class="cx">     , m_codeType(FunctionCode)
</span><span class="cx">     , m_nextConstantOffset(0)
</span><del>-    , m_globalConstantIndex(0)
</del><span class="cx">     , m_firstLazyFunction(0)
</span><span class="cx">     , m_lastLazyFunction(0)
</span><span class="cx">     , m_staticPropertyAnalyzer(&amp;m_instructions)
</span><span class="lines">@@ -463,7 +461,6 @@
</span><span class="cx">     , m_localScopeDepth(0)
</span><span class="cx">     , m_codeType(EvalCode)
</span><span class="cx">     , m_nextConstantOffset(0)
</span><del>-    , m_globalConstantIndex(0)
</del><span class="cx">     , m_firstLazyFunction(0)
</span><span class="cx">     , m_lastLazyFunction(0)
</span><span class="cx">     , m_staticPropertyAnalyzer(&amp;m_instructions)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (178881 => 178882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h        2015-01-22 02:06:22 UTC (rev 178881)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h        2015-01-22 02:06:33 UTC (rev 178882)
</span><span class="lines">@@ -576,7 +576,9 @@
</span><span class="cx">         bool isStrictMode() const { return m_codeBlock-&gt;isStrictMode(); }
</span><span class="cx">         
</span><span class="cx">         bool isBuiltinFunction() const { return m_isBuiltinFunction; }
</span><del>-        
</del><ins>+
+        OpcodeID lastOpcodeID() const { return m_lastOpcodeID; }
+
</ins><span class="cx">     private:
</span><span class="cx">         friend class Label;
</span><span class="cx">         
</span><span class="lines">@@ -741,7 +743,8 @@
</span><span class="cx">         {
</span><span class="cx">             return watchableVariable(operand) != UINT_MAX;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
+    private:
</ins><span class="cx">         Vector&lt;UnlinkedInstruction, 0, UnsafeVectorOverflow&gt; m_instructions;
</span><span class="cx"> 
</span><span class="cx">         bool m_shouldEmitDebugHooks;
</span><span class="lines">@@ -786,10 +789,7 @@
</span><span class="cx"> 
</span><span class="cx">         int m_firstConstantIndex;
</span><span class="cx">         int m_nextConstantOffset;
</span><del>-        unsigned m_globalConstantIndex;
</del><span class="cx"> 
</span><del>-        int m_globalVarStorageOffset;
-
</del><span class="cx">         int m_firstLazyFunction;
</span><span class="cx">         int m_lastLazyFunction;
</span><span class="cx">         HashMap&lt;unsigned int, FunctionBodyNode*, WTF::IntHash&lt;unsigned int&gt;, WTF::UnsignedWithZeroKeyHashTraits&lt;unsigned int&gt;&gt; m_lazyFunctions;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (178881 => 178882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp        2015-01-22 02:06:22 UTC (rev 178881)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp        2015-01-22 02:06:33 UTC (rev 178882)
</span><span class="lines">@@ -1323,7 +1323,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;RegisterID&gt; src1 = generator.emitNodeForLeftHandSide(left, m_rightHasAssignments, right-&gt;isPure(generator));
</span><del>-    bool wasTypeof = generator.m_lastOpcodeID == op_typeof;
</del><ins>+    bool wasTypeof = generator.lastOpcodeID() == op_typeof;
</ins><span class="cx">     RefPtr&lt;RegisterID&gt; src2 = generator.emitNode(right);
</span><span class="cx">     generator.emitExpressionInfo(position(), position(), position());
</span><span class="cx">     if (wasTypeof &amp;&amp; (opcodeID == op_neq || opcodeID == op_nstricteq)) {
</span></span></pre>
</div>
</div>

</body>
</html>