Unreviewed, follow-up after 262809@main

https://bugs.webkit.org/show_bug.cgi?id=255273 rdar://107871233 Follow-up after 262809@main. Resolving review comments. * Source/JavaScriptCore/runtime/JSObject.cpp: * Source/JavaScriptCore/runtime/ObjectConstructor.cpp: (JSC::JSC_DEFINE_HOST_FUNCTION): * Source/JavaScriptCore/runtime/StructureInlines.h: (JSC::Structure::addPropertyTransitionToExistingStructureImpl): (JSC::StructureTransitionTable::finalizeUnconditionally): Canonical link: https://commits.webkit.org/262811@main
WebKit · Apr 11, 2023 · ec39b38 · ec39b38
1 parent 8096a94
commit ec39b38
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp
@@ -40,7 +40,6 @@
 #include "PropertyDescriptor.h"
 #include "PropertyNameArray.h"
 #include "ProxyObject.h"
-#include "SuperSampler.h"
 #include "TypeError.h"
 #include "VMInlines.h"
 #include "VMTrapsInlines.h"

diff --git a/Source/JavaScriptCore/runtime/ObjectConstructor.cpp b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
@@ -326,6 +326,8 @@ JSC_DEFINE_HOST_FUNCTION(objectConstructorAssign, (JSGlobalObject* globalObject,
     bool targetCanPerformFastPut = jsDynamicCast<JSFinalObject*>(target) && target->canPerformFastPutInlineExcludingProto() && target->isStructureExtensible();
     unsigned argsCount = callFrame->argumentCount();
 
+    // argsCount == 2 case does not need to use arguments' batching.
+    // We limit argsCount < 5 not to increase properties / values vector super large.
     if (argsCount > 2 && argsCount < 5 && targetCanPerformFastPut) {
         bool willBatch = true;
         for (unsigned i = 1; i < argsCount; ++i) {

diff --git a/Source/JavaScriptCore/runtime/StructureInlines.h b/Source/JavaScriptCore/runtime/StructureInlines.h
@@ -35,7 +35,6 @@
 #include "Structure.h"
 #include "StructureChain.h"
 #include "StructureRareDataInlines.h"
-#include "SuperSampler.h"
 #include "Watchpoint.h"
 #include <wtf/CompactRefPtr.h>
 #include <wtf/Threading.h>
@@ -712,16 +711,10 @@ inline Structure* Structure::addPropertyTransitionToExistingStructureImpl(Struct
     if (structure->hasBeenDictionary())
         return nullptr;
 
-    Structure* existingTransition = nullptr;
-    {
-        {
-            existingTransition = structure->m_transitionTable.get(uid, attributes, TransitionKind::PropertyAddition);
-        }
-        if (existingTransition) {
-            validateOffset(existingTransition->transitionOffset(), existingTransition->inlineCapacity());
-            offset = existingTransition->transitionOffset();
-            return existingTransition;
-        }
+    if (Structure* existingTransition = structure->m_transitionTable.get(uid, attributes, TransitionKind::PropertyAddition)) {
+        validateOffset(existingTransition->transitionOffset(), existingTransition->inlineCapacity());
+        offset = existingTransition->transitionOffset();
+        return existingTransition;
     }
 
     return nullptr;
@@ -758,9 +751,8 @@ inline Structure* StructureTransitionTable::get(UniquedStringImpl* rep, unsigned
 
 inline void StructureTransitionTable::finalizeUnconditionally(VM& vm, CollectionScope)
 {
-    if (isUsingSingleSlot()) {
-        auto* transition = trySingleTransition();
-        if (transition && !vm.heap.isMarked(transition))
+    if (auto* transition = trySingleTransition()) {
+        if (!vm.heap.isMarked(transition))
             m_data = UsingSingleSlotFlag;
     }
 }