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

Timestamp:

May 2, 2008, 11:10:33 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Move call stack depth counter to global object.

• kjs/ExecState.h: (KJS::ExecState::functionCallDepth): Added a recursion depth counter to per-thread data.
• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::init): Initialize PerThreadData.functionCallDepth.
• kjs/JSGlobalObject.h: (KJS::JSGlobalObject::perThreadData): Made the result non-const.

• kjs/object.cpp: (KJS::throwStackSizeExceededError): Moved throwError to a separate function, since it is now the only thing in JSObject::call that needs a PIC branch. (KJS::JSObject::call): Use a per-thread variable instead of local static for recursion depth tracking.

File:

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

trunk/JavaScriptCore/kjs/ExecState.h

@@ -61 +61 @@
         
         Heap* heap;
+
+        unsigned functionCallDepth;
     };
 
@@ -125 +127 @@
         Heap* heap() const { return m_perThreadData->heap; }
 
+        unsigned& functionCallDepth() { return m_perThreadData->functionCallDepth; }
+
         LocalStorage& localStorage() { return *m_localStorage; }
         void setLocalStorage(LocalStorage* s) { m_localStorage = s; }
@@ -205 +209 @@
         ExecState* m_callingExec;
 
-        const PerThreadData* m_perThreadData;
+        PerThreadData* m_perThreadData;
 
         ScopeNode* m_scopeNode;