Changeset 93947 in webkit for trunk/Source/JavaScriptCore/runtime/Executable.h

Timestamp:

Aug 27, 2011, 2:49:46 PM (14 years ago)

Author:

[email protected]

Message:

JSC::Executable is inconsistent about using weak handle finalizers
and destructors for releasing memory
​https://bugs.webkit.org/show_bug.cgi?id=67072

Reviewed by Darin Adler.

Moved more of the destruction of Executable state into the finalizer,
which also resulted in an opportunity to mostly combine this with
discardCode(). This also means that the finalizer is now enabled even
when the JIT is turned off. This is performance neutral on SunSpider,
V8, and Kraken.

• runtime/Executable.cpp:

(JSC::ExecutableBase::clearCode):
(JSC::ExecutableFinalizer::finalize):
(JSC::EvalExecutable::clearCode):
(JSC::ProgramExecutable::clearCode):
(JSC::FunctionExecutable::discardCode):
(JSC::FunctionExecutable::clearCode):

• runtime/Executable.h:

(JSC::ExecutableBase::finishCreation):

File:

• trunk/Source/JavaScriptCore/runtime/Executable.h (modified) (7 diffs)

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -64 +64 @@
         {
             Base::finishCreation(globalData);
-#if ENABLE(JIT)
             Weak<ExecutableBase> finalizer(globalData, this, executableFinalizer());
             finalizer.leakHandle();
-#endif
         }
         
@@ -89 +87 @@
         
         static const ClassInfo s_info;
+
+        virtual void clearCode();
 
     protected:
@@ -157 +157 @@
         }
 
-        void clearExecutableCode()
-        {
-            m_jitCodeForCall.clear();
-            m_jitCodeForConstruct.clear();
-        }
-
     protected:
         JITCode m_jitCodeForCall;
@@ -168 +162 @@
         MacroAssemblerCodePtr m_jitCodeForCallWithArityCheck;
         MacroAssemblerCodePtr m_jitCodeForConstructWithArityCheck;
+#endif
         
     private:
         static WeakHandleOwner* executableFinalizer();
-#endif
     };
 
@@ -340 +334 @@
         
         static const ClassInfo s_info;
+
+    protected:
+        virtual void clearCode();
+
     private:
         static const unsigned StructureFlags = OverridesVisitChildren | ScriptExecutable::StructureFlags;
@@ -393 +391 @@
         
         static const ClassInfo s_info;
+        
+    protected:
+        virtual void clearCode();
 
     private:
@@ -524 +525 @@
         
         static const ClassInfo s_info;
-
-    protected:
+        
+    protected:
+        virtual void clearCode();
+
         void finishCreation(JSGlobalData& globalData, const Identifier& name, int firstLine, int lastLine)
         {