<!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>[170724] branches/ftlopt/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/170724">170724</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 14:35:43 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ftlopt] Remove the functionality for cloning StructureRareData since we never do that anymore.
Rubber stamped by Mark Hahnenberg.
* runtime/Structure.cpp:
(JSC::Structure::Structure):
(JSC::Structure::cloneRareDataFrom): Deleted.
* runtime/Structure.h:
* runtime/StructureRareData.cpp:
(JSC::StructureRareData::clone): Deleted.
(JSC::StructureRareData::StructureRareData): Deleted.
* runtime/StructureRareData.h:
(JSC::StructureRareData::needsCloning): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesftloptSourceJavaScriptCoreChangeLog">branches/ftlopt/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeStructurecpp">branches/ftlopt/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeStructureh">branches/ftlopt/Source/JavaScriptCore/runtime/Structure.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeStructureRareDatacpp">branches/ftlopt/Source/JavaScriptCore/runtime/StructureRareData.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeStructureRareDatah">branches/ftlopt/Source/JavaScriptCore/runtime/StructureRareData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesftloptSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ChangeLog (170723 => 170724)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-07-02 21:31:23 UTC (rev 170723)
+++ branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-07-02 21:35:43 UTC (rev 170724)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-02 Filip Pizlo <fpizlo@apple.com>
+
+ [ftlopt] Remove the functionality for cloning StructureRareData since we never do that anymore.
+
+ Rubber stamped by Mark Hahnenberg.
+
+ * runtime/Structure.cpp:
+ (JSC::Structure::Structure):
+ (JSC::Structure::cloneRareDataFrom): Deleted.
+ * runtime/Structure.h:
+ * runtime/StructureRareData.cpp:
+ (JSC::StructureRareData::clone): Deleted.
+ (JSC::StructureRareData::StructureRareData): Deleted.
+ * runtime/StructureRareData.h:
+ (JSC::StructureRareData::needsCloning): Deleted.
+
</ins><span class="cx"> 2014-07-01 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> [ftlopt] DebuggerCallFrame::scope() should return a DebuggerScope.
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/Structure.cpp (170723 => 170724)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/Structure.cpp 2014-07-02 21:31:23 UTC (rev 170723)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/Structure.cpp 2014-07-02 21:35:43 UTC (rev 170724)
</span><span class="lines">@@ -243,9 +243,7 @@
</span><span class="cx"> m_outOfLineTypeFlags = typeInfo.outOfLineTypeFlags();
</span><span class="cx">
</span><span class="cx"> ASSERT(!previous->typeInfo().structureIsImmortal());
</span><del>- if (previous->hasRareData() && previous->rareData()->needsCloning())
- cloneRareDataFrom(vm, previous);
- else if (previous->previousID())
</del><ins>+ if (previous->previousID())
</ins><span class="cx"> m_previousOrRareData.set(vm, this, previous->previousID());
</span><span class="cx">
</span><span class="cx"> previous->notifyTransitionFromThisStructure();
</span><span class="lines">@@ -819,16 +817,6 @@
</span><span class="cx"> ASSERT(hasRareData());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Structure::cloneRareDataFrom(VM& vm, const Structure* other)
-{
- ASSERT(!hasRareData());
- ASSERT(other->hasRareData());
- StructureRareData* newRareData = StructureRareData::clone(vm, other->rareData());
- m_previousOrRareData.set(vm, this, newRareData);
- setHasRareData(true);
- ASSERT(hasRareData());
-}
-
</del><span class="cx"> #if DUMP_PROPERTYMAP_STATS
</span><span class="cx">
</span><span class="cx"> struct PropertyMapStatisticsExitLogger {
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeStructureh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/Structure.h (170723 => 170724)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/Structure.h 2014-07-02 21:31:23 UTC (rev 170723)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/Structure.h 2014-07-02 21:35:43 UTC (rev 170724)
</span><span class="lines">@@ -503,7 +503,6 @@
</span><span class="cx"> bool checkOffsetConsistency() const;
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void allocateRareData(VM&);
</span><del>- void cloneRareDataFrom(VM&, const Structure*);
</del><span class="cx">
</span><span class="cx"> static const int s_maxTransitionLength = 64;
</span><span class="cx"> static const int s_maxTransitionLengthForNonEvalPutById = 512;
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeStructureRareDatacpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/StructureRareData.cpp (170723 => 170724)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/StructureRareData.cpp 2014-07-02 21:31:23 UTC (rev 170723)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/StructureRareData.cpp 2014-07-02 21:35:43 UTC (rev 170724)
</span><span class="lines">@@ -46,13 +46,6 @@
</span><span class="cx"> return rareData;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StructureRareData* StructureRareData::clone(VM& vm, const StructureRareData* other)
-{
- StructureRareData* newRareData = new (NotNull, allocateCell<StructureRareData>(vm.heap)) StructureRareData(vm, other);
- newRareData->finishCreation(vm);
- return newRareData;
-}
-
</del><span class="cx"> StructureRareData::StructureRareData(VM& vm, Structure* previous)
</span><span class="cx"> : JSCell(vm, vm.structureRareDataStructure.get())
</span><span class="cx"> {
</span><span class="lines">@@ -60,15 +53,6 @@
</span><span class="cx"> m_previous.set(vm, this, previous);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StructureRareData::StructureRareData(VM& vm, const StructureRareData* other)
- : JSCell(vm, other->structure())
-{
- if (other->previousID())
- m_previous.set(vm, this, other->previousID());
- if (other->objectToStringValue())
- m_objectToStringValue.set(vm, this, other->objectToStringValue());
-}
-
</del><span class="cx"> void StructureRareData::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> StructureRareData* thisObject = jsCast<StructureRareData*>(cell);
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeStructureRareDatah"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/StructureRareData.h (170723 => 170724)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/StructureRareData.h 2014-07-02 21:31:23 UTC (rev 170723)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/StructureRareData.h 2014-07-02 21:35:43 UTC (rev 170724)
</span><span class="lines">@@ -39,15 +39,11 @@
</span><span class="cx"> friend class Structure;
</span><span class="cx"> public:
</span><span class="cx"> static StructureRareData* create(VM&, Structure*);
</span><del>- static StructureRareData* clone(VM&, const StructureRareData* other);
</del><span class="cx">
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> static Structure* createStructure(VM&, JSGlobalObject*, JSValue prototype);
</span><span class="cx">
</span><del>- // Returns true if this StructureRareData should also be cloned when cloning the owner Structure.
- bool needsCloning() const { return false; }
-
</del><span class="cx"> Structure* previousID() const;
</span><span class="cx"> void setPreviousID(VM&, Structure* transition, Structure*);
</span><span class="cx"> void clearPreviousID();
</span><span class="lines">@@ -62,7 +58,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> StructureRareData(VM&, Structure*);
</span><del>- StructureRareData(VM&, const StructureRareData*);
</del><span class="cx">
</span><span class="cx"> static const unsigned StructureFlags = OverridesVisitChildren | JSCell::StructureFlags;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>