<!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>[170729] 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/170729">170729</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 15:34:43 -0700 (Wed, 02 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ftlopt] Allocate a new GetterSetter if we change the value of any of its entries other than when they were previously null, so that if we constant-infer an accessor slot then we immediately get the function constant for free
https://bugs.webkit.org/show_bug.cgi?id=134518
Reviewed by Mark Hahnenberg.
This has no real effect right now, particularly since almost all uses of
setSetter/setGetter were already allocating a branch new GetterSetter. But once we start
doing more aggressive constant property inference, this change will allow us to remove
all runtime checks from getter/setter calls.
* runtime/GetterSetter.cpp:
(JSC::GetterSetter::withGetter):
(JSC::GetterSetter::withSetter):
* runtime/GetterSetter.h:
(JSC::GetterSetter::setGetter):
(JSC::GetterSetter::setSetter):
* runtime/JSObject.cpp:
(JSC::JSObject::defineOwnNonIndexProperty):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesftloptSourceJavaScriptCoreChangeLog">branches/ftlopt/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeGetterSettercpp">branches/ftlopt/Source/JavaScriptCore/runtime/GetterSetter.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeGetterSetterh">branches/ftlopt/Source/JavaScriptCore/runtime/GetterSetter.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreruntimeJSObjectcpp">branches/ftlopt/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesftloptSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ChangeLog (170728 => 170729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-07-02 22:14:01 UTC (rev 170728)
+++ branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-07-02 22:34:43 UTC (rev 170729)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-07-01 Filip Pizlo <fpizlo@apple.com>
+
+ [ftlopt] Allocate a new GetterSetter if we change the value of any of its entries other than when they were previously null, so that if we constant-infer an accessor slot then we immediately get the function constant for free
+ https://bugs.webkit.org/show_bug.cgi?id=134518
+
+ Reviewed by Mark Hahnenberg.
+
+ This has no real effect right now, particularly since almost all uses of
+ setSetter/setGetter were already allocating a branch new GetterSetter. But once we start
+ doing more aggressive constant property inference, this change will allow us to remove
+ all runtime checks from getter/setter calls.
+
+ * runtime/GetterSetter.cpp:
+ (JSC::GetterSetter::withGetter):
+ (JSC::GetterSetter::withSetter):
+ * runtime/GetterSetter.h:
+ (JSC::GetterSetter::setGetter):
+ (JSC::GetterSetter::setSetter):
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::defineOwnNonIndexProperty):
+
</ins><span class="cx"> 2014-07-02 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> [ftlopt] Rename notifyTransitionFromThisStructure to didTransitionFromThisStructure
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeGetterSettercpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/GetterSetter.cpp (170728 => 170729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/GetterSetter.cpp 2014-07-02 22:14:01 UTC (rev 170728)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/GetterSetter.cpp 2014-07-02 22:34:43 UTC (rev 170729)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999-2002 Harri Porten (porten@kde.org)
</span><span class="cx"> * Copyright (C) 2001 Peter Kelly (pmk@post.com)
</span><del>- * Copyright (C) 2004, 2007, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2007, 2008, 2009, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -45,6 +45,32 @@
</span><span class="cx"> visitor.append(&thisObject->m_setter);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+GetterSetter* GetterSetter::withGetter(VM& vm, JSObject* newGetter)
+{
+ if (!getter()) {
+ setGetter(vm, newGetter);
+ return this;
+ }
+
+ GetterSetter* result = GetterSetter::create(vm);
+ result->setGetter(vm, newGetter);
+ result->setSetter(vm, setter());
+ return result;
+}
+
+GetterSetter* GetterSetter::withSetter(VM& vm, JSObject* newSetter)
+{
+ if (!setter()) {
+ setSetter(vm, newSetter);
+ return this;
+ }
+
+ GetterSetter* result = GetterSetter::create(vm);
+ result->setGetter(vm, getter());
+ result->setSetter(vm, newSetter);
+ return result;
+}
+
</ins><span class="cx"> JSValue callGetter(ExecState* exec, JSValue base, JSValue getterSetter)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Some callers may invoke get() without checking for an exception first.
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeGetterSetterh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/GetterSetter.h (170728 => 170729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/GetterSetter.h 2014-07-02 22:14:01 UTC (rev 170728)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/GetterSetter.h 2014-07-02 22:34:43 UTC (rev 170729)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
</span><span class="cx"> * Copyright (C) 2001 Peter Kelly (pmk@post.com)
</span><del>- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -33,7 +33,11 @@
</span><span class="cx"> class JSObject;
</span><span class="cx">
</span><span class="cx"> // This is an internal value object which stores getter and setter functions
</span><del>- // for a property.
</del><ins>+ // for a property. Instances of this class have the property that once a getter
+ // or setter is set to a non-null value, then they cannot be changed. This means
+ // that if a property holding a GetterSetter reference is constant-inferred and
+ // that constant is observed to have a non-null setter (or getter) then we can
+ // constant fold that setter (or getter).
</ins><span class="cx"> class GetterSetter : public JSCell {
</span><span class="cx"> friend class JIT;
</span><span class="cx">
</span><span class="lines">@@ -56,9 +60,28 @@
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> JSObject* getter() const { return m_getter.get(); }
</span><del>- void setGetter(VM& vm, JSObject* getter) { m_getter.setMayBeNull(vm, this, getter); }
</del><ins>+
+ // Set the getter. It's only valid to call this if you've never set the getter on this
+ // object.
+ void setGetter(VM& vm, JSObject* getter)
+ {
+ RELEASE_ASSERT(!m_getter);
+ m_getter.setMayBeNull(vm, this, getter);
+ }
+
</ins><span class="cx"> JSObject* setter() const { return m_setter.get(); }
</span><del>- void setSetter(VM& vm, JSObject* setter) { m_setter.setMayBeNull(vm, this, setter); }
</del><ins>+
+ // Set the setter. It's only valid to call this if you've never set the setter on this
+ // object.
+ void setSetter(VM& vm, JSObject* setter)
+ {
+ RELEASE_ASSERT(!m_setter);
+ m_setter.setMayBeNull(vm, this, setter);
+ }
+
+ GetterSetter* withGetter(VM&, JSObject* getter);
+ GetterSetter* withSetter(VM&, JSObject* setter);
+
</ins><span class="cx"> static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
</span><span class="cx"> {
</span><span class="cx"> return Structure::create(vm, globalObject, prototype, TypeInfo(GetterSetterType, OverridesVisitChildren), info());
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/runtime/JSObject.cpp (170728 => 170729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/runtime/JSObject.cpp 2014-07-02 22:14:01 UTC (rev 170728)
+++ branches/ftlopt/Source/JavaScriptCore/runtime/JSObject.cpp 2014-07-02 22:34:43 UTC (rev 170729)
</span><span class="lines">@@ -2632,9 +2632,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> GetterSetter* getterSetter = asGetterSetter(accessor);
</span><span class="cx"> if (descriptor.setterPresent())
</span><del>- getterSetter->setSetter(exec->vm(), descriptor.setterObject());
</del><ins>+ getterSetter = getterSetter->withSetter(exec->vm(), descriptor.setterObject());
</ins><span class="cx"> if (descriptor.getterPresent())
</span><del>- getterSetter->setGetter(exec->vm(), descriptor.getterObject());
</del><ins>+ getterSetter = getterSetter->withGetter(exec->vm(), descriptor.getterObject());
</ins><span class="cx"> if (current.attributesEqual(descriptor))
</span><span class="cx"> return true;
</span><span class="cx"> methodTable(exec->vm())->deleteProperty(this, exec, propertyName);
</span></span></pre>
</div>
</div>
</body>
</html>