Changeset 250289 in webkit

Timestamp:

Sep 24, 2019 12:43:24 AM (5 years ago)

Author:

mark.lam@apple.com

Message:

Refactor cellSize() out of VMInspector::verifyCellSize().
​https://bugs.webkit.org/show_bug.cgi?id=202132

Reviewed by Saam Barati.

• CMakeLists.txt:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/CellSize.h: Added.

(JSC::isDynamicallySizedType):
(JSC::cellSize):

• runtime/DirectArguments.h:
• runtime/JSBigInt.h:
• runtime/JSModuleNamespaceObject.h:
• runtime/JSType.h:

(JSC::isDynamicallySizedType): Deleted.

• tools/VMInspectorInlines.h:

(JSC::VMInspector::verifyCellSize):

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• runtime/CellSize.h (added)
• runtime/DirectArguments.h (modified) (1 diff)
• runtime/JSBigInt.h (modified) (1 diff)
• runtime/JSModuleNamespaceObject.h (modified) (1 diff)
• runtime/JSType.h (modified) (1 diff)
• tools/VMInspectorInlines.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -768 +768 @@
     runtime/CallData.h
     runtime/CatchScope.h
+    runtime/CellSize.h
     runtime/ClassInfo.h
     runtime/CodeSpecializationKind.h

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-09-24  Mark Lam  <mark.lam@apple.com>
+
+        Refactor cellSize() out of VMInspector::verifyCellSize().
+        https://bugs.webkit.org/show_bug.cgi?id=202132
+
+        Reviewed by Saam Barati.
+
+        * CMakeLists.txt:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * runtime/CellSize.h: Added.
+        (JSC::isDynamicallySizedType):
+        (JSC::cellSize):
+        * runtime/DirectArguments.h:
+        * runtime/JSBigInt.h:
+        * runtime/JSModuleNamespaceObject.h:
+        * runtime/JSType.h:
+        (JSC::isDynamicallySizedType): Deleted.
+        * tools/VMInspectorInlines.h:
+        (JSC::VMInspector::verifyCellSize):
+
 2019-09-23  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1912 +1912 @@
                 FEB51F6C1A97B688001F921C /* Regress141809.mm in Sources */ = {isa = PBXBuildFile; fileRef = FEB51F6B1A97B688001F921C /* Regress141809.mm */; };
                 FEB58C15187B8B160098EF0B /* ErrorHandlingScope.h in Headers */ = {isa = PBXBuildFile; fileRef = FEB58C13187B8B160098EF0B /* ErrorHandlingScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                FEC160322339E9F900A04CB8 /* CellSize.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC160312339E9F900A04CB8 /* CellSize.h */; };
                 FEC5797323105B5100BCA83F /* VMInspectorInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC5797223105B4800BCA83F /* VMInspectorInlines.h */; };
                 FEC5797623105F4E00BCA83F /* Integrity.h in Headers */ = {isa = PBXBuildFile; fileRef = FEC5797523105F4300BCA83F /* Integrity.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5139 +5140 @@
                 FEB58C12187B8B160098EF0B /* ErrorHandlingScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ErrorHandlingScope.cpp; sourceTree = "<group>"; };
                 FEB58C13187B8B160098EF0B /* ErrorHandlingScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ErrorHandlingScope.h; sourceTree = "<group>"; };
+                FEC160312339E9F900A04CB8 /* CellSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CellSize.h; sourceTree = "<group>"; };
                 FEC5797223105B4800BCA83F /* VMInspectorInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMInspectorInlines.h; sourceTree = "<group>"; };
                 FEC5797423105F4200BCA83F /* Integrity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Integrity.cpp; sourceTree = "<group>"; };
@@ -6950 +6952 @@
                                 FE80C1981D775FB4008510C0 /* CatchScope.cpp */,
                                 FE80C1961D775B27008510C0 /* CatchScope.h */,
+                                FEC160312339E9F900A04CB8 /* CellSize.h */,
                                 E326C4961ECBEF5700A9A905 /* ClassInfo.cpp */,
                                 BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */,
@@ -9030 +9033 @@
                                 0F1C3DDA1BBCE09E00E523E4 /* CellState.h in Headers */,
                                 BC6AAAE50E1F426500AD87D8 /* ClassInfo.h in Headers */,
+                                FEC160322339E9F900A04CB8 /* CellSize.h in Headers */,
                                 0FE050261AA9095600D33B33 /* ClonedArguments.h in Headers */,
                                 BC18C45E0E16F5CD00B34460 /* CLoopStack.h in Headers */,

trunk/Source/JavaScriptCore/runtime/DirectArguments.h

@@ -186 +186 @@
     MappedArguments m_mappedArguments; // If non-null, it means that length, callee, and caller are fully materialized properties.
 
-    friend class VMInspector;
+    friend size_t cellSize(VM&, JSCell*);
 };
 

trunk/Source/JavaScriptCore/runtime/JSBigInt.h

@@ -251 +251 @@
     bool m_sign { false };
 
-    friend class VMInspector;
+    friend size_t cellSize(VM&, JSCell*);
 };
 

trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.h

@@ -105 +105 @@
     WriteBarrier<AbstractModuleRecord> m_moduleRecord;
 
-    friend class VMInspector;
+    friend size_t cellSize(VM&, JSCell*);
 };
 

trunk/Source/JavaScriptCore/runtime/JSType.h

@@ -141 +141 @@
 }
 
-inline constexpr bool isDynamicallySizedType(JSType type)
-{
-    if (type == BigIntType
-        || type == DirectArgumentsType
-        || type == FinalObjectType
-        || type == LexicalEnvironmentType
-        || type == ModuleEnvironmentType
-        || type == ModuleNamespaceObjectType)
-        return true;
-    return false;
-}
-
 } // namespace JSC
 

trunk/Source/JavaScriptCore/tools/VMInspectorInlines.h

@@ -26 +26 @@
 #pragma once
 
-#include "DirectArguments.h"
-#include "JSBigInt.h"
-#include "JSLexicalEnvironment.h"
-#include "JSModuleEnvironment.h"
-#include "JSModuleNamespaceObject.h"
+#include "CellSize.h"
 #include "VMInspector.h"
 #include <wtf/Assertions.h>
@@ -52 +48 @@
     AUDIT_VERIFY(action, verifier, cellType == structure->m_blob.type(), cell, cellType, structure->m_blob.type());
 
-    if (isDynamicallySizedType(cellType)) {
-        size_t cellSize = 0;
-        switch (cellType) {
-        case BigIntType: {
-            auto* bigInt = jsCast<JSBigInt*>(cell);
-            cellSize = JSBigInt::allocationSize(bigInt->length());
-            break;
-        }
-        case DirectArgumentsType: {
-            auto* args = jsCast<DirectArguments*>(cell);
-            cellSize = DirectArguments::allocationSize(args->m_minCapacity);
-            break;
-        }
-        case FinalObjectType:
-            cellSize = JSFinalObject::allocationSize(structure->inlineCapacity());
-            break;
-        case LexicalEnvironmentType: {
-            auto* env = jsCast<JSLexicalEnvironment*>(cell);
-            cellSize = JSLexicalEnvironment::allocationSize(env->symbolTable());
-            break;
-        }
-        case ModuleEnvironmentType: {
-            auto* env = jsCast<JSModuleEnvironment*>(cell);
-            cellSize = JSModuleEnvironment::allocationSize(env->symbolTable());
-            break;
-        }
-        case ModuleNamespaceObjectType: {
-            auto* obj = jsCast<JSModuleNamespaceObject*>(cell);
-            cellSize = JSModuleNamespaceObject::allocationSize(obj->m_names.capacity());
-            break;
-        }
-        default:
-            RELEASE_ASSERT_NOT_REACHED();
-        }
-        AUDIT_VERIFY(action, verifier, cellSize <= allocatorCellSize, cell, cellType, cellSize, allocatorCellSize);
-        AUDIT_VERIFY(action, verifier, cellSize >= classInfo->staticClassSize, cell, cellType, cellSize, classInfo->staticClassSize);
-    } else
-        AUDIT_VERIFY(action, verifier, classInfo->staticClassSize <= allocatorCellSize, cell, cellType, classInfo->staticClassSize, allocatorCellSize);
+    size_t size = cellSize(vm, cell);
+    AUDIT_VERIFY(action, verifier, size <= allocatorCellSize, cell, cellType, size, allocatorCellSize, classInfo->staticClassSize);
+    if (isDynamicallySizedType(cellType))
+        AUDIT_VERIFY(action, verifier, size >= classInfo->staticClassSize, cell, cellType, size, classInfo->staticClassSize);
 
     return true;