<!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>[165265] 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/165265">165265</a></dd>

<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>

<dt>Date</dt> <dd>2014-03-07 09:13:38 -0800 (Fri, 07 Mar 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Use OwnPtr in StructureIDTable

https://bugs.webkit.org/show_bug.cgi?id=129828

Reviewed by Geoffrey Garen.

This reduces the amount of boilerplate and fixes a memory leak.

* runtime/StructureIDTable.cpp:

(JSC::StructureIDTable::StructureIDTable):

(JSC::StructureIDTable::resize):

(JSC::StructureIDTable::flushOldTables):

(JSC::StructureIDTable::allocateID):

(JSC::StructureIDTable::deallocateID):

* runtime/StructureIDTable.h:

(JSC::StructureIDTable::table):

(JSC::StructureIDTable::get):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeStructureIDTablecpp">trunk/Source/JavaScriptCore/runtime/StructureIDTable.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeStructureIDTableh">trunk/Source/JavaScriptCore/runtime/StructureIDTable.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165264 => 165265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-03-07 17:03:51 UTC (rev 165264)

+++ trunk/Source/JavaScriptCore/ChangeLog        2014-03-07 17:13:38 UTC (rev 165265)

</span><span class="lines">@@ -1,3 +1,22 @@

</span><ins>+2014-03-07  Mark Hahnenberg  &lt;mhahnenberg@apple.com&gt;

+

+        Use OwnPtr in StructureIDTable

+        https://bugs.webkit.org/show_bug.cgi?id=129828

+

+        Reviewed by Geoffrey Garen.

+

+        This reduces the amount of boilerplate and fixes a memory leak.

+

+        * runtime/StructureIDTable.cpp:

+        (JSC::StructureIDTable::StructureIDTable):

+        (JSC::StructureIDTable::resize):

+        (JSC::StructureIDTable::flushOldTables):

+        (JSC::StructureIDTable::allocateID):

+        (JSC::StructureIDTable::deallocateID):

+        * runtime/StructureIDTable.h:

+        (JSC::StructureIDTable::table):

+        (JSC::StructureIDTable::get):

+

</ins><span class="cx"> 2014-03-07  Andrew Trick  &lt;atrick@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         FLT should call fmod directly on platforms where LLVM cannot relocate the libcall

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreruntimeStructureIDTablecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StructureIDTable.cpp (165264 => 165265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/runtime/StructureIDTable.cpp        2014-03-07 17:03:51 UTC (rev 165264)

+++ trunk/Source/JavaScriptCore/runtime/StructureIDTable.cpp        2014-03-07 17:13:38 UTC (rev 165265)

</span><span class="lines">@@ -29,12 +29,13 @@

</span><span class="cx"> #include &lt;limits.h&gt;

</span><span class="cx"> #include &lt;wtf/Atomics.h&gt;

</span><span class="cx"> #include &lt;wtf/DataLog.h&gt;

</span><ins>+#include &lt;wtf/PassOwnPtr.h&gt;

</ins><span class="cx"> 

</span><span class="cx"> namespace JSC {

</span><span class="cx"> 

</span><span class="cx"> StructureIDTable::StructureIDTable()

</span><span class="cx">     : m_firstFreeOffset(0)

</span><del>-    , m_table(new StructureOrOffset[s_initialSize])

</del><ins>+    , m_table(adoptPtr(new StructureOrOffset[s_initialSize]))

</ins><span class="cx">     , m_size(0)

</span><span class="cx">     , m_capacity(s_initialSize)

</span><span class="cx"> {

</span><span class="lines">@@ -43,28 +44,22 @@

</span><span class="cx">     allocateID(0);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-StructureIDTable::~StructureIDTable()

-{

-    delete [] m_table;

-}

-

</del><span class="cx"> void StructureIDTable::resize(size_t newCapacity)

</span><span class="cx"> {

<span class="cx">     // Create the new table.

</span><del>-    StructureOrOffset* newTable = new StructureOrOffset[newCapacity];

</del><ins>+    OwnPtr&lt;StructureOrOffset&gt; newTable = adoptPtr(new StructureOrOffset[newCapacity]);

</ins><span class="cx"> 

<span class="cx">     // Copy the contents of the old table to the new table.

</span><del>-    memcpy(newTable, m_table, m_capacity * sizeof(StructureOrOffset));

</del><ins>+    memcpy(newTable.get(), table(), m_capacity * sizeof(StructureOrOffset));

</ins><span class="cx"> 

<span class="cx">     // Store fence to make sure we've copied everything before doing the swap.

</span><span class="cx">     WTF::storeStoreFence();

</span><span class="cx"> 

<span class="cx">     // Swap the old and new tables.

</span><del>-    StructureOrOffset* oldTable = m_table;

-    m_table = newTable;

</del><ins>+    swap(m_table, newTable);

</ins><span class="cx"> 

<span class="cx">     // Put the old table (now labeled as new) into the list of old tables.

</span><del>-    m_oldTables.append(oldTable);

</del><ins>+    m_oldTables.append(newTable.release());

</ins><span class="cx"> 

<span class="cx">     // Update the capacity.

</span><span class="cx">     m_capacity = newCapacity;

</span><span class="lines">@@ -72,8 +67,6 @@

</span><span class="cx"> 

</span><span class="cx"> void StructureIDTable::flushOldTables()

</span><span class="cx"> {

</span><del>-    for (unsigned i = 0; i &lt; m_oldTables.size(); ++i)

-        delete [] m_oldTables[i];

</del><span class="cx">     m_oldTables.clear();

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -95,7 +88,7 @@

</span><span class="cx">         }

</span><span class="cx"> 

</span><span class="cx">         StructureID result = m_size;

</span><del>-        m_table[result] = newEntry;

</del><ins>+        table()[result] = newEntry;

</ins><span class="cx">         m_size++;

</span><span class="cx">         return result;

</span><span class="cx">     }

</span><span class="lines">@@ -103,8 +96,8 @@

</span><span class="cx">     ASSERT(m_firstFreeOffset != s_unusedID);

</span><span class="cx"> 

</span><span class="cx">     StructureID result = m_firstFreeOffset;

</span><del>-    m_firstFreeOffset = m_table[m_firstFreeOffset].offset;

-    m_table[result].structure = structure;

</del><ins>+    m_firstFreeOffset = table()[m_firstFreeOffset].offset;

+    table()[result].structure = structure;

</ins><span class="cx">     return result;

</span><span class="cx"> #else

</span><span class="cx">     return structure;

</span><span class="lines">@@ -115,8 +108,8 @@

</span><span class="cx"> {

</span><span class="cx"> #if USE(JSVALUE64)

</span><span class="cx">     ASSERT(structureID != s_unusedID);

</span><del>-    RELEASE_ASSERT(m_table[structureID].structure == structure);

-    m_table[structureID].offset = m_firstFreeOffset;

</del><ins>+    RELEASE_ASSERT(table()[structureID].structure == structure);

+    table()[structureID].offset = m_firstFreeOffset;

</ins><span class="cx">     m_firstFreeOffset = structureID;

</span><span class="cx"> #else

</span><span class="cx">     UNUSED_PARAM(structure);

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreruntimeStructureIDTableh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StructureIDTable.h (165264 => 165265)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/runtime/StructureIDTable.h        2014-03-07 17:03:51 UTC (rev 165264)

+++ trunk/Source/JavaScriptCore/runtime/StructureIDTable.h        2014-03-07 17:13:38 UTC (rev 165265)

</span><span class="lines">@@ -27,6 +27,7 @@

</span><span class="cx"> #define StructureIDTable_h

</span><span class="cx"> 

</span><span class="cx"> #include &quot;UnusedPointer.h&quot;

</span><ins>+#include &lt;wtf/OwnPtr.h&gt;

</ins><span class="cx"> #include &lt;wtf/Vector.h&gt;

</span><span class="cx"> 

</span><span class="cx"> namespace JSC {

</span><span class="lines">@@ -43,7 +44,6 @@

</span><span class="cx">     friend class LLIntOffsetsExtractor;

</span><span class="cx"> public:

</span><span class="cx">     StructureIDTable();

</span><del>-    ~StructureIDTable();

</del><span class="cx"> 

</span><span class="cx">     void** base() { return reinterpret_cast&lt;void**&gt;(&amp;m_table); }

</span><span class="cx"> 

</span><span class="lines">@@ -55,7 +55,7 @@

</span><span class="cx"> 

</span><span class="cx"> private:

</span><span class="cx">     void resize(size_t newCapacity);

</span><del>-    

</del><ins>+

</ins><span class="cx">     union StructureOrOffset {

</span><span class="cx">         WTF_MAKE_FAST_ALLOCATED;

</span><span class="cx">     public:

</span><span class="lines">@@ -63,12 +63,14 @@

</span><span class="cx">         StructureID offset;

</span><span class="cx">     };

</span><span class="cx"> 

</span><ins>+    StructureOrOffset* table() const { return m_table.get(); }

+    

</ins><span class="cx">     static const size_t s_initialSize = 256;

</span><span class="cx"> 

</span><del>-    Vector&lt;StructureOrOffset*&gt; m_oldTables;

</del><ins>+    Vector&lt;OwnPtr&lt;StructureOrOffset&gt;&gt; m_oldTables;

</ins><span class="cx"> 

</span><span class="cx">     uint32_t m_firstFreeOffset;

</span><del>-    StructureOrOffset* m_table;

</del><ins>+    OwnPtr&lt;StructureOrOffset&gt; m_table;

</ins><span class="cx"> 

</span><span class="cx">     size_t m_size;

</span><span class="cx">     size_t m_capacity;

</span><span class="lines">@@ -81,7 +83,7 @@

</span><span class="cx"> inline Structure* StructureIDTable::get(StructureID structureID)

</span><span class="cx"> {

</span><span class="cx"> #if USE(JSVALUE64)

</span><del>-    return m_table[structureID].structure;

</del><ins>+    return table()[structureID].structure;

</ins><span class="cx"> #else

</span><span class="cx">     return structureID;

</span><span class="cx"> #endif

</span></span></pre>

</div>

</div>

</body>

</html>