Changeset 292493 in webkit for trunk/Source/JavaScriptCore/dfg

Timestamp:

Apr 6, 2022, 12:35:37 PM (3 years ago)

Author:

[email protected]

Message:

Call Structure::get instead of Structure::getConcurrently on the mutator thread
​https://bugs.webkit.org/show_bug.cgi?id=238823

Reviewed by Yusuke Suzuki.

We try to call Structure::get instead of Structure::getConcurrently when
we know for sure we're on the main thread. This is because getConcurrently
is slower than get.

• bytecode/AccessCase.cpp:

(JSC::AccessCase::couldStillSucceed const):
(JSC::AccessCase::generateImpl):

• bytecode/AdaptiveInferredPropertyValueWatchpointBase.cpp:

(JSC::AdaptiveInferredPropertyValueWatchpointBase::install):

• bytecode/LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp:

(JSC::LLIntPrototypeLoadAdaptiveStructureWatchpoint::install):

• bytecode/ObjectPropertyCondition.cpp:

(JSC::ObjectPropertyCondition::structureEnsuresValidityAssumingImpurePropertyWatchpoint const):
(JSC::ObjectPropertyCondition::isStillValidAssumingImpurePropertyWatchpoint const):
(JSC::ObjectPropertyCondition::isStillValid const):
(JSC::ObjectPropertyCondition::structureEnsuresValidity const):

• bytecode/ObjectPropertyCondition.h:
• bytecode/ObjectPropertyConditionSet.cpp:

(JSC::ObjectPropertyConditionSet::structuresEnsureValidity const):
(JSC::generateConditionsForPropertyMiss):
(JSC::generateConditionsForPropertySetterMiss):
(JSC::generateConditionsForPrototypePropertyHit):
(JSC::generateConditionsForPrototypePropertyHitCustom):
(JSC::generateConditionsForPrototypeEquivalenceConcurrently):
(JSC::generateConditionsForPropertyMissConcurrently):
(JSC::generateConditionsForPropertySetterMissConcurrently):
(JSC::generateConditionForSelfEquivalence):
(JSC::ObjectPropertyConditionSet::structuresEnsureValidityAssumingImpurePropertyWatchpoint const): Deleted.
(JSC::ObjectPropertyConditionSet::isValidAndWatchable const): Deleted.

• bytecode/ObjectPropertyConditionSet.h:
• bytecode/PropertyCondition.cpp:

(JSC::PropertyCondition::isStillValidAssumingImpurePropertyWatchpoint const):
(JSC::watchabilityToConcurrency):
(JSC::PropertyCondition::isStillValid const):
(JSC::PropertyCondition::isWatchableWhenValid const):
(JSC::PropertyCondition::isWatchableAssumingImpurePropertyWatchpoint const):
(JSC::PropertyCondition::isWatchable const):

• bytecode/PropertyCondition.h:
• dfg/DFGAdaptiveStructureWatchpoint.cpp:

(JSC::DFG::AdaptiveStructureWatchpoint::install):

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::check):
(JSC::DFG::ByteCodeParser::planLoad):

• dfg/DFGConstantFoldingPhase.cpp:

(JSC::DFG::ConstantFoldingPhase::tryFoldAsPutByOffset):

• dfg/DFGDesiredWatchpoints.h:

(JSC::DFG::AdaptiveStructureWatchpointAdaptor::hasBeenInvalidated):

• dfg/DFGGraph.cpp:

(JSC::DFG::Graph::watchCondition):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::setupGetByIdPrototypeCache):

• runtime/CachedSpecialPropertyAdaptiveStructureWatchpoint.cpp:

(JSC::CachedSpecialPropertyAdaptiveStructureWatchpoint::install):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::tryInstallSpeciesWatchpoint):

• runtime/JSObject.h:

(JSC::JSObject::getDirect const):

• runtime/Structure.h:

(JSC::Structure::get):

• runtime/StructureRareData.cpp:

(JSC::StructureRareData::cacheSpecialPropertySlow):

Location:

trunk/Source/JavaScriptCore/dfg

Files:

• DFGAdaptiveStructureWatchpoint.cpp (modified) (1 diff)
• DFGByteCodeParser.cpp (modified) (2 diffs)
• DFGConstantFoldingPhase.cpp (modified) (1 diff)
• DFGDesiredWatchpoints.h (modified) (1 diff)
• DFGGraph.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp

@@ -59 +59 @@
 void AdaptiveStructureWatchpoint::install(VM& vm)
 {
-    RELEASE_ASSERT(m_key.isWatchable());
+    RELEASE_ASSERT(m_key.isWatchable(PropertyCondition::MakeNoChanges));
     
     m_key.object()->structure(vm)->addTransitionWatchpoint(this);

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -4252 +4252 @@
     
     Structure* structure = condition.object()->structure(*m_vm);
-    if (!condition.structureEnsuresValidity(structure))
+    if (!condition.structureEnsuresValidity(Concurrency::ConcurrentThread, structure))
         return false;
     
@@ -4381 +4381 @@
     // Check if the structure that we've registered makes the condition hold. If not, just give
     // up. This is case (5) above.
-    if (!condition.structureEnsuresValidity(structure))
+    if (!condition.structureEnsuresValidity(Concurrency::ConcurrentThread, structure))
         return GetByOffsetMethod();
     

trunk/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp

@@ -1436 +1436 @@
 
                     Structure* structure = condition.object()->structure(m_graph.m_vm);
-                    if (!condition.structureEnsuresValidity(structure))
+                    if (!condition.structureEnsuresValidity(Concurrency::ConcurrentThread, structure))
                         return;
 

trunk/Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.h

@@ -165 +165 @@
     static bool hasBeenInvalidated(const ObjectPropertyCondition& key)
     {
-        return !key.isWatchable();
+        return !key.isWatchable(PropertyCondition::MakeNoChanges);
     }
     static void dumpInContext(

trunk/Source/JavaScriptCore/dfg/DFGGraph.cpp

@@ -1065 +1065 @@
         return false;
 
-    if (!key.isWatchable())
+    if (!key.isWatchable(PropertyCondition::MakeNoChanges))
         return false;