<!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>[166217] 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/166217">166217</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-03-24 20:27:46 -0700 (Mon, 24 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Safari crashes in JavaScriptCore: JSC::JSObject::growOutOfLineStorage
when WebKit is compiled with fcatch-undefined-behavior
https://bugs.webkit.org/show_bug.cgi?id=130652
Reviewed by Mark Hahnenberg.
Use a static member function because the butterfly we pass in might be
NULL, and passing NULL to a member function is undefined behavior.
Stylistically, I think this new way reads a little more clearly, since it
matches createOrGrowArrayRight, and it helps to convey that m_butterfly
might not exist yet.
* runtime/Butterfly.h:
* runtime/ButterflyInlines.h:
(JSC::Butterfly::createOrGrowPropertyStorage): Renamed from growPropertyStorage
because we might create. Split out the create path to avoid using NULL
in a member function expression.
Removed some unused versions of this function.
* runtime/JSObject.cpp:
(JSC::JSObject::growOutOfLineStorage): Updated for interface change.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeButterflyh">trunk/Source/JavaScriptCore/runtime/Butterfly.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeButterflyInlinesh">trunk/Source/JavaScriptCore/runtime/ButterflyInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166216 => 166217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 01:54:01 UTC (rev 166216)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 03:27:46 UTC (rev 166217)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-03-24 Geoffrey Garen <ggaren@apple.com>
+
+ Safari crashes in JavaScriptCore: JSC::JSObject::growOutOfLineStorage
+ when WebKit is compiled with fcatch-undefined-behavior
+ https://bugs.webkit.org/show_bug.cgi?id=130652
+
+ Reviewed by Mark Hahnenberg.
+
+ Use a static member function because the butterfly we pass in might be
+ NULL, and passing NULL to a member function is undefined behavior.
+
+ Stylistically, I think this new way reads a little more clearly, since it
+ matches createOrGrowArrayRight, and it helps to convey that m_butterfly
+ might not exist yet.
+
+ * runtime/Butterfly.h:
+ * runtime/ButterflyInlines.h:
+ (JSC::Butterfly::createOrGrowPropertyStorage): Renamed from growPropertyStorage
+ because we might create. Split out the create path to avoid using NULL
+ in a member function expression.
+
+ Removed some unused versions of this function.
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::growOutOfLineStorage): Updated for interface change.
+
</ins><span class="cx"> 2014-03-24 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Strict mode destructuring assignment crashes the parser.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeButterflyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Butterfly.h (166216 => 166217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Butterfly.h 2014-03-25 01:54:01 UTC (rev 166216)
+++ trunk/Source/JavaScriptCore/runtime/Butterfly.h 2014-03-25 03:27:46 UTC (rev 166217)
</span><span class="lines">@@ -157,9 +157,7 @@
</span><span class="cx"> // methods is not exhaustive and is not intended to encapsulate all possible allocation
</span><span class="cx"> // modes of butterflies - there are code paths that allocate butterflies by calling
</span><span class="cx"> // directly into Heap::tryAllocateStorage.
</span><del>- Butterfly* growPropertyStorage(VM&, JSCell* intendedOwner, size_t preCapacity, size_t oldPropertyCapacity, bool hasIndexingHeader, size_t indexingPayloadSizeInBytes, size_t newPropertyCapacity);
- Butterfly* growPropertyStorage(VM&, JSCell* intendedOwner, Structure* oldStructure, size_t oldPropertyCapacity, size_t newPropertyCapacity);
- Butterfly* growPropertyStorage(VM&, JSCell* intendedOwner, Structure* oldStructure, size_t newPropertyCapacity);
</del><ins>+ static Butterfly* createOrGrowPropertyStorage(Butterfly*, VM&, JSCell* intendedOwner, Structure*, size_t oldPropertyCapacity, size_t newPropertyCapacity);
</ins><span class="cx"> Butterfly* growArrayRight(VM&, JSCell* intendedOwner, Structure* oldStructure, size_t propertyCapacity, bool hadIndexingHeader, size_t oldIndexingPayloadSizeInBytes, size_t newIndexingPayloadSizeInBytes); // Assumes that preCapacity is zero, and asserts as much.
</span><span class="cx"> Butterfly* growArrayRight(VM&, JSCell* intendedOwner, Structure*, size_t newIndexingPayloadSizeInBytes);
</span><span class="cx"> Butterfly* resizeArray(VM&, JSCell* intendedOwner, size_t propertyCapacity, bool oldHasIndexingHeader, size_t oldIndexingPayloadSizeInBytes, size_t newPreCapacity, bool newHasIndexingHeader, size_t newIndexingPayloadSizeInBytes);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeButterflyInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ButterflyInlines.h (166216 => 166217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ButterflyInlines.h 2014-03-25 01:54:01 UTC (rev 166216)
+++ trunk/Source/JavaScriptCore/runtime/ButterflyInlines.h 2014-03-25 03:27:46 UTC (rev 166217)
</span><span class="lines">@@ -75,39 +75,25 @@
</span><span class="cx"> return base(indexingHeader()->preCapacity(structure), structure->outOfLineCapacity());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Butterfly* Butterfly::growPropertyStorage(
- VM& vm, JSCell* intendedOwner, size_t preCapacity, size_t oldPropertyCapacity,
- bool hasIndexingHeader, size_t indexingPayloadSizeInBytes, size_t newPropertyCapacity)
</del><ins>+inline Butterfly* Butterfly::createOrGrowPropertyStorage(
+ Butterfly* oldButterfly, VM& vm, JSCell* intendedOwner, Structure* structure, size_t oldPropertyCapacity, size_t newPropertyCapacity)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(newPropertyCapacity > oldPropertyCapacity);
</span><ins>+ if (!oldButterfly)
+ return create(vm, intendedOwner, 0, newPropertyCapacity, false, IndexingHeader(), 0);
+
+ size_t preCapacity = oldButterfly->indexingHeader()->preCapacity(structure);
+ size_t indexingPayloadSizeInBytes = oldButterfly->indexingHeader()->indexingPayloadSizeInBytes(structure);
+ bool hasIndexingHeader = structure->hasIndexingHeader(intendedOwner);
</ins><span class="cx"> Butterfly* result = createUninitialized(
</span><del>- vm, intendedOwner, preCapacity, newPropertyCapacity, hasIndexingHeader,
- indexingPayloadSizeInBytes);
</del><ins>+ vm, intendedOwner, preCapacity, newPropertyCapacity, hasIndexingHeader, indexingPayloadSizeInBytes);
</ins><span class="cx"> memcpy(
</span><span class="cx"> result->propertyStorage() - oldPropertyCapacity,
</span><del>- propertyStorage() - oldPropertyCapacity,
</del><ins>+ oldButterfly->propertyStorage() - oldPropertyCapacity,
</ins><span class="cx"> totalSize(0, oldPropertyCapacity, hasIndexingHeader, indexingPayloadSizeInBytes));
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Butterfly* Butterfly::growPropertyStorage(
- VM& vm, JSCell* intendedOwner, Structure* structure, size_t oldPropertyCapacity,
- size_t newPropertyCapacity)
-{
- return growPropertyStorage(
- vm, intendedOwner, indexingHeader()->preCapacity(structure), oldPropertyCapacity,
- structure->hasIndexingHeader(intendedOwner),
- indexingHeader()->indexingPayloadSizeInBytes(structure), newPropertyCapacity);
-}
-
-inline Butterfly* Butterfly::growPropertyStorage(
- VM& vm, JSCell* intendedOwner, Structure* oldStructure, size_t newPropertyCapacity)
-{
- return growPropertyStorage(
- vm, intendedOwner, oldStructure, oldStructure->outOfLineCapacity(),
- newPropertyCapacity);
-}
-
</del><span class="cx"> inline Butterfly* Butterfly::createOrGrowArrayRight(
</span><span class="cx"> Butterfly* oldButterfly, VM& vm, JSCell* intendedOwner, Structure* oldStructure,
</span><span class="cx"> size_t propertyCapacity, bool hadIndexingHeader, size_t oldIndexingPayloadSizeInBytes,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (166216 => 166217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2014-03-25 01:54:01 UTC (rev 166216)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2014-03-25 03:27:46 UTC (rev 166217)
</span><span class="lines">@@ -2438,7 +2438,7 @@
</span><span class="cx"> // It's important that this function not rely on structure(), for the property
</span><span class="cx"> // capacity, since we might have already mutated the structure in-place.
</span><span class="cx">
</span><del>- return m_butterfly->growPropertyStorage(vm, this, structure(vm), oldSize, newSize);
</del><ins>+ return Butterfly::createOrGrowPropertyStorage(m_butterfly.get(), vm, this, structure(vm), oldSize, newSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSObject::getOwnPropertyDescriptor(ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
</span></span></pre>
</div>
</div>
</body>
</html>