Changeset 201610 in webkit

Timestamp:

Jun 2, 2016, 12:36:59 PM (10 years ago)

Author:

keith_miller@apple.com

Message:

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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/ObjectPropertyCondition.cpp (modified) (2 diffs)
• bytecode/ObjectPropertyCondition.h (modified) (1 diff)
• bytecode/ObjectPropertyConditionSet.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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:
+
 2016-06-02  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.cpp

@@ -50 +50 @@
     Structure* structure) const
 {
-    return m_condition.isStillValidAssumingImpurePropertyWatchpoint(structure, m_object);
+    return m_condition.isStillValidAssumingImpurePropertyWatchpoint(structure);
 }
 
@@ -73 +73 @@
     return validityRequiresImpurePropertyWatchpoint(m_object->structure());
 }
+
+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());
+}
+
 
 bool ObjectPropertyCondition::isStillValid(Structure* structure) const

trunk/Source/JavaScriptCore/bytecode/ObjectPropertyCondition.h

@@ -187 +187 @@
     bool validityRequiresImpurePropertyWatchpoint() const;
 
+    // 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;
+
     // Checks if the condition still holds. May conservatively return false, if the object and
     // structure alone don't guarantee the condition. Note that this may return true if the

trunk/Source/JavaScriptCore/bytecode/ObjectPropertyConditionSet.cpp

@@ -214 +214 @@
     }
 
-    if (!result.structureEnsuresValidityAssumingImpurePropertyWatchpoint()) {
+    if (!result.isStillValidAssumingImpurePropertyWatchpoint()) {
         if (verbose)
             dataLog("Failed to create condition: ", result, "\n");