Changeset 32652 in webkit for trunk/JavaScriptCore/kjs/ExecState.h

Timestamp:

Apr 28, 2008, 11:22:14 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Fix run-webkit-tests --threading
and provisionally fix <​https://bugs.webkit.org/show_bug.cgi?id=18661>
Proxy server issue in Sunday's Nightly

Changed ClassInfo objects for built-in objects to hold a getter function returning
a per-thread instance. This makes it safe to share these ClassInfo objects between threads -
and these are the only ones that need to be shared.

File:

• trunk/JavaScriptCore/kjs/ExecState.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/ExecState.h

@@ -39 +39 @@
     class FunctionImp;
     class GlobalFuncImp;
+    struct HashTable;
     class Interpreter;
     class JSGlobalObject;
@@ -46 +47 @@
     
     enum CodeType { GlobalCode, EvalCode, FunctionCode };
+
+    struct PerThreadData {
+        const HashTable* arrayTable;
+        const HashTable* dateTable;
+        const HashTable* mathTable;
+        const HashTable* numberTable;
+        const HashTable* RegExpImpTable;
+        const HashTable* RegExpObjectImpTable;
+        const HashTable* stringTable;
+
+        CommonIdentifiers* propertyNames;
+        const List emptyList;
+    };
 
     // Represents the current state of script execution.
@@ -97 +111 @@
         // These pointers are used to avoid accessing global variables for these,
         // to avoid taking PIC branches in Mach-O binaries.
-        const CommonIdentifiers& propertyNames() const { return *m_propertyNames; }
-        const List& emptyList() const { return *m_emptyList; }
+        const CommonIdentifiers& propertyNames() const { return *m_perThreadData->propertyNames; }
+        const List& emptyList() const { return m_perThreadData->emptyList; }
+        static const HashTable* arrayTable(ExecState* exec) { return exec->m_perThreadData->arrayTable; }
+        static const HashTable* dateTable(ExecState* exec) { return exec->m_perThreadData->dateTable; }
+        static const HashTable* mathTable(ExecState* exec) { return exec->m_perThreadData->mathTable; }
+        static const HashTable* numberTable(ExecState* exec) { return exec->m_perThreadData->numberTable; }
+        static const HashTable* RegExpImpTable(ExecState* exec) { return exec->m_perThreadData->RegExpImpTable; }
+        static const HashTable* RegExpObjectImpTable(ExecState* exec) { return exec->m_perThreadData->RegExpObjectImpTable; }
+        static const HashTable* stringTable(ExecState* exec) { return exec->m_perThreadData->stringTable; }
 
         LocalStorage& localStorage() { return *m_localStorage; }
@@ -177 +198 @@
         JSGlobalObject* m_globalObject;
         JSValue* m_exception;
-        CommonIdentifiers* m_propertyNames;
-        const List* m_emptyList;
 
         ExecState* m_callingExec;
+
+        const PerThreadData* m_perThreadData;
 
         ScopeNode* m_scopeNode;