Changeset 261877 in webkit

Timestamp:

May 19, 2020 11:49:07 AM (4 years ago)

Author:

mark.lam@apple.com

Message:

Put PtrTagLookup data structures in Configs for freezing.
​https://bugs.webkit.org/show_bug.cgi?id=212089
<rdar://problem/63401487>

Reviewed by Robin Morisset.

Source/JavaScriptCore:

PtrTagLookup data structures were always meant to only be initialized once at
initialization time and never modified thereafter. This patch puts them in the
Configs for freezing to document and enforce this invariant.

• runtime/JSCConfig.h:
• runtime/JSCPtrTag.cpp:

(JSC::initializePtrTagLookup):

Source/WTF:

• wtf/PtrTag.cpp:

(WTF::tagForPtr):
(WTF::ptrTagName):
(WTF::registerPtrTagLookup):

• wtf/PtrTag.h:

(WTF::PtrTagLookup::initialize):

• wtf/WTFConfig.h:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/JSCConfig.h (modified) (3 diffs)
• JavaScriptCore/runtime/JSCPtrTag.cpp (modified) (3 diffs)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PtrTag.cpp (modified) (4 diffs)
• WTF/wtf/PtrTag.h (modified) (1 diff)
• WTF/wtf/WTFConfig.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-05-19  Mark Lam  <mark.lam@apple.com>
+
+        Put PtrTagLookup data structures in Configs for freezing.
+        https://bugs.webkit.org/show_bug.cgi?id=212089
+        <rdar://problem/63401487>
+
+        Reviewed by Robin Morisset.
+
+        PtrTagLookup data structures were always meant to only be initialized once at
+        initialization time and never modified thereafter.  This patch puts them in the
+        Configs for freezing to document and enforce this invariant.
+
+        * runtime/JSCConfig.h:
+        * runtime/JSCPtrTag.cpp:
+        (JSC::initializePtrTagLookup):
+
 2020-05-19  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSCConfig.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +28 @@
 #include "OptionsList.h"
 #include <wtf/PageBlock.h>
+#include <wtf/PtrTag.h>
 #include <wtf/StdLibExtras.h>
 
@@ -81 +82 @@
 
             void (*shellTimeoutCheckCallback)(VM&);
+
+            WTF::PtrTagLookup ptrTagLookupRecord;
         };
         char ensureSize[ConfigSizeToProtect];

trunk/Source/JavaScriptCore/runtime/JSCPtrTag.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26 +26 @@
 #include "config.h"
 #include "JSCPtrTag.h"
+
+#include "JSCConfig.h"
 
 namespace JSC {
@@ -53 +55 @@
 void initializePtrTagLookup()
 {
-    static WTF::PtrTagLookup lookup = { tagForPtr, ptrTagName };
+    WTF::PtrTagLookup& lookup = g_jscConfig.ptrTagLookupRecord;
+    lookup.initialize(tagForPtr, ptrTagName);
     WTF::registerPtrTagLookup(&lookup);
 }

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-05-19  Mark Lam  <mark.lam@apple.com>
+
+        Put PtrTagLookup data structures in Configs for freezing.
+        https://bugs.webkit.org/show_bug.cgi?id=212089
+        <rdar://problem/63401487>
+
+        Reviewed by Robin Morisset.
+
+        * wtf/PtrTag.cpp:
+        (WTF::tagForPtr):
+        (WTF::ptrTagName):
+        (WTF::registerPtrTagLookup):
+        * wtf/PtrTag.h:
+        (WTF::PtrTagLookup::initialize):
+        * wtf/WTFConfig.h:
+
 2020-05-19  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WTF/wtf/PtrTag.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 #include <wtf/PtrTag.h>
 
+#include <wtf/WTFConfig.h>
+
 namespace WTF {
 
 #if CPU(ARM64E)
 
-static PtrTagLookup* s_ptrTagLookup = nullptr;
-
 static const char* tagForPtr(const void* ptr)
 {
-    PtrTagLookup* lookup = s_ptrTagLookup;
+    PtrTagLookup* lookup = g_wtfConfig.ptrTagLookupHead;
     while (lookup) {
         const char* tagName = lookup->tagForPtr(ptr);
@@ -57 +57 @@
 static const char* ptrTagName(PtrTag tag)
 {
-    PtrTagLookup* lookup = s_ptrTagLookup;
+    PtrTagLookup* lookup = g_wtfConfig.ptrTagLookupHead;
     while (lookup) {
         const char* tagName = lookup->ptrTagName(tag);
@@ -75 +75 @@
 void registerPtrTagLookup(PtrTagLookup* lookup)
 {
-    lookup->next = s_ptrTagLookup;
-    s_ptrTagLookup = lookup;
+    lookup->next = g_wtfConfig.ptrTagLookupHead;
+    g_wtfConfig.ptrTagLookupHead = lookup;
 }
 

trunk/Source/WTF/wtf/PtrTag.h

@@ -86 +86 @@
 
 struct PtrTagLookup {
-    const char* (*tagForPtr)(const void*);
-    const char* (*ptrTagName)(PtrTag);
-    PtrTagLookup* next { nullptr };
+    using TagForPtrFunc = const char* (*)(const void*);
+    using PtrTagNameFunc = const char* (*)(PtrTag);
+
+    void initialize(TagForPtrFunc tagForPtr, PtrTagNameFunc ptrTagName)
+    {
+        this->tagForPtr = tagForPtr;
+        this->ptrTagName = ptrTagName;
+    }
+
+    TagForPtrFunc tagForPtr;
+    PtrTagNameFunc ptrTagName;
+    PtrTagLookup* next;
 };
 

trunk/Source/WTF/wtf/WTFConfig.h

@@ -30 +30 @@
 #include <wtf/ExportMacros.h>
 #include <wtf/PageBlock.h>
+#include <wtf/PtrTag.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/threads/Signals.h>
@@ -56 +57 @@
             SignalHandlers signalHandlers;
 #endif
+            PtrTagLookup* ptrTagLookupHead;
         };
         char ensureSize[ConfigSizeToProtect];