<!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>[202033] 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/202033">202033</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2016-06-13 23:57:15 -0700 (Mon, 13 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>setUpStaticFunctionSlot does not handle Builtin|Accessor properties
https://bugs.webkit.org/show_bug.cgi?id=158637
Reviewed by Geoff Garen.
setUpStaticFunctionSlot contains a duplicate copy of the body of the function reifyStaticProperty
- however it is missing handling for Accessor type under Builtin functions.
Fix the bug by de-duplicating - setUpStaticFunctionSlot should just call reifyStaticProperty.
* runtime/Lookup.cpp:
(JSC::setUpStaticFunctionSlot):
- should just call reifyStaticProperty.
* runtime/Lookup.h:
(JSC::lookupPut):
(JSC::reifyStaticProperty):
- changed reifyStaticProperty to take PropertyName.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookupcpp">trunk/Source/JavaScriptCore/runtime/Lookup.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookuph">trunk/Source/JavaScriptCore/runtime/Lookup.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202032 => 202033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-14 06:36:30 UTC (rev 202032)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-14 06:57:15 UTC (rev 202033)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-06-13 Gavin & Ellie Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><ins>+ setUpStaticFunctionSlot does not handle Builtin|Accessor properties
+ https://bugs.webkit.org/show_bug.cgi?id=158637
+
+ Reviewed by Geoff Garen.
+
+ setUpStaticFunctionSlot contains a duplicate copy of the body of the function reifyStaticProperty
+ - however it is missing handling for Accessor type under Builtin functions.
+ Fix the bug by de-duplicating - setUpStaticFunctionSlot should just call reifyStaticProperty.
+
+ * runtime/Lookup.cpp:
+ (JSC::setUpStaticFunctionSlot):
+ - should just call reifyStaticProperty.
+ * runtime/Lookup.h:
+ (JSC::lookupPut):
+ (JSC::reifyStaticProperty):
+ - changed reifyStaticProperty to take PropertyName.
+
+2016-06-13 Gavin & Ellie Barraclough <barraclough@apple.com>
+
</ins><span class="cx"> JSBoundSlotBaseFunction no longer binds slot base
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157978
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.cpp (202032 => 202033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2016-06-14 06:36:30 UTC (rev 202032)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2016-06-14 06:57:15 UTC (rev 202033)
</span><span class="lines">@@ -56,30 +56,7 @@
</span><span class="cx"> if (thisObject->staticPropertiesReified())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (entry->attributes() & Builtin)
- thisObject->putDirectBuiltinFunction(vm, thisObject->globalObject(), propertyName, entry->builtinGenerator()(vm), attributesForStructure(entry->attributes()));
- else if (entry->attributes() & Function) {
- thisObject->putDirectNativeFunction(
- vm, thisObject->globalObject(), propertyName, entry->functionLength(),
- entry->function(), entry->intrinsic(), attributesForStructure(entry->attributes()));
- } else if (isAccessor)
- reifyStaticAccessor(vm, *entry, *thisObject, propertyName);
- else if (entry->attributes() & CellProperty) {
- LazyCellProperty* property = bitwise_cast<LazyCellProperty*>(
- bitwise_cast<char*>(thisObject) + entry->lazyCellPropertyOffset());
- JSCell* result = property->get(thisObject);
- thisObject->putDirect(vm, propertyName, result, attributesForStructure(entry->attributes()));
- } else if (entry->attributes() & ClassStructure) {
- LazyClassStructure* structure = bitwise_cast<LazyClassStructure*>(
- bitwise_cast<char*>(thisObject) + entry->lazyClassStructureOffset());
- structure->get(jsCast<JSGlobalObject*>(thisObject));
- } else if (entry->attributes() & PropertyCallback) {
- JSValue result = entry->lazyPropertyCallback()(vm, thisObject);
- thisObject->putDirect(vm, propertyName, result, attributesForStructure(entry->attributes()));
- } else {
- dataLog("Static hashtable entry for ", propertyName, " has weird attributes: ", entry->attributes(), "\n");
- RELEASE_ASSERT_NOT_REACHED();
- }
</del><ins>+ reifyStaticProperty(vm, propertyName, *entry, *thisObject);
</ins><span class="cx">
</span><span class="cx"> offset = thisObject->getDirectOffset(vm, propertyName, attributes);
</span><span class="cx"> if (!isValidOffset(offset)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.h (202032 => 202033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.h 2016-06-14 06:36:30 UTC (rev 202032)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.h 2016-06-14 06:57:15 UTC (rev 202033)
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void reifyStaticProperty(VM& vm, const Identifier& propertyName, const HashTableValue& value, JSObject& thisObj)
</del><ins>+inline void reifyStaticProperty(VM& vm, const PropertyName& propertyName, const HashTableValue& value, JSObject& thisObj)
</ins><span class="cx"> {
</span><span class="cx"> if (value.attributes() & Builtin) {
</span><span class="cx"> if (value.attributes() & Accessor)
</span></span></pre>
</div>
</div>
</body>
</html>