<!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>[201610] 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/201610">201610</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-06-02 12:36:59 -0700 (Thu, 02 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ObjectPropertyCondition should have a isStillValidAssumingImpurePropertyWatchpoint function
https://bugs.webkit.org/show_bug.cgi?id=158308
Reviewed by Filip Pizlo.
Recently, structureEnsuresValidityAssumingImpurePropertyWatchpoint was converted to check
what should be isStillValidAssumingImpurePropertyWatchpoint. This patch fixes the API so
it should work as expected. This patch also changes generateConditions in
ObjectPropertyConditionSet to use isStillValidAssumingImpurePropertyWatchpoint.
* bytecode/ObjectPropertyCondition.cpp:
(JSC::ObjectPropertyCondition::structureEnsuresValidityAssumingImpurePropertyWatchpoint):
(JSC::ObjectPropertyCondition::isStillValidAssumingImpurePropertyWatchpoint):
* bytecode/ObjectPropertyCondition.h:
* bytecode/ObjectPropertyConditionSet.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeObjectPropertyConditioncpp">trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeObjectPropertyConditionh">trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeObjectPropertyConditionSetcpp">trunk/Source/JavaScriptCore/bytecode/ObjectPropertyConditionSet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201609 => 201610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-02 19:21:53 UTC (rev 201609)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-02 19:36:59 UTC (rev 201610)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-02 Keith Miller <keith_miller@apple.com>
+
+ ObjectPropertyCondition should have a isStillValidAssumingImpurePropertyWatchpoint function
+ https://bugs.webkit.org/show_bug.cgi?id=158308
+
+ Reviewed by Filip Pizlo.
+
+ Recently, structureEnsuresValidityAssumingImpurePropertyWatchpoint was converted to check
+ what should be isStillValidAssumingImpurePropertyWatchpoint. This patch fixes the API so
+ it should work as expected. This patch also changes generateConditions in
+ ObjectPropertyConditionSet to use isStillValidAssumingImpurePropertyWatchpoint.
+
+ * bytecode/ObjectPropertyCondition.cpp:
+ (JSC::ObjectPropertyCondition::structureEnsuresValidityAssumingImpurePropertyWatchpoint):
+ (JSC::ObjectPropertyCondition::isStillValidAssumingImpurePropertyWatchpoint):
+ * bytecode/ObjectPropertyCondition.h:
+ * bytecode/ObjectPropertyConditionSet.cpp:
+
</ins><span class="cx"> 2016-06-02 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it harder to accidentally pass an integer to a locker.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeObjectPropertyConditioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.cpp (201609 => 201610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.cpp 2016-06-02 19:21:53 UTC (rev 201609)
+++ trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.cpp 2016-06-02 19:36:59 UTC (rev 201610)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> bool ObjectPropertyCondition::structureEnsuresValidityAssumingImpurePropertyWatchpoint(
</span><span class="cx"> Structure* structure) const
</span><span class="cx"> {
</span><del>- return m_condition.isStillValidAssumingImpurePropertyWatchpoint(structure, m_object);
</del><ins>+ return m_condition.isStillValidAssumingImpurePropertyWatchpoint(structure);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ObjectPropertyCondition::structureEnsuresValidityAssumingImpurePropertyWatchpoint() const
</span><span class="lines">@@ -73,6 +73,20 @@
</span><span class="cx"> return validityRequiresImpurePropertyWatchpoint(m_object->structure());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ObjectPropertyCondition::isStillValidAssumingImpurePropertyWatchpoint(Structure* structure) const
+{
+ return m_condition.isStillValidAssumingImpurePropertyWatchpoint(structure, m_object);
+}
+
+bool ObjectPropertyCondition::isStillValidAssumingImpurePropertyWatchpoint() const
+{
+ if (!*this)
+ return false;
+
+ return isStillValidAssumingImpurePropertyWatchpoint(m_object->structure());
+}
+
+
</ins><span class="cx"> bool ObjectPropertyCondition::isStillValid(Structure* structure) const
</span><span class="cx"> {
</span><span class="cx"> return m_condition.isStillValid(structure, m_object);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeObjectPropertyConditionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.h (201609 => 201610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.h 2016-06-02 19:21:53 UTC (rev 201609)
+++ trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.h 2016-06-02 19:36:59 UTC (rev 201610)
</span><span class="lines">@@ -186,6 +186,11 @@
</span><span class="cx"> bool validityRequiresImpurePropertyWatchpoint(Structure*) const;
</span><span class="cx"> bool validityRequiresImpurePropertyWatchpoint() const;
</span><span class="cx">
</span><ins>+ // Checks if the condition still holds setting aside the need for an impure property watchpoint.
+ // Validity might still require watchpoints on the object.
+ bool isStillValidAssumingImpurePropertyWatchpoint(Structure*) const;
+ bool isStillValidAssumingImpurePropertyWatchpoint() const;
+
</ins><span class="cx"> // Checks if the condition still holds. May conservatively return false, if the object and
</span><span class="cx"> // structure alone don't guarantee the condition. Note that this may return true if the
</span><span class="cx"> // condition still requires some watchpoints on the object in addition to checking the
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeObjectPropertyConditionSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ObjectPropertyConditionSet.cpp (201609 => 201610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ObjectPropertyConditionSet.cpp 2016-06-02 19:21:53 UTC (rev 201609)
+++ trunk/Source/JavaScriptCore/bytecode/ObjectPropertyConditionSet.cpp 2016-06-02 19:36:59 UTC (rev 201610)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> return ObjectPropertyCondition();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!result.structureEnsuresValidityAssumingImpurePropertyWatchpoint()) {
</del><ins>+ if (!result.isStillValidAssumingImpurePropertyWatchpoint()) {
</ins><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Failed to create condition: ", result, "\n");
</span><span class="cx"> return ObjectPropertyCondition();
</span></span></pre>
</div>
</div>
</body>
</html>