Changeset 47405 in webkit for trunk/JavaScriptCore/bytecode/EvalCodeCache.h

Timestamp:

Aug 17, 2009, 6:05:37 PM (16 years ago)

Author:

[email protected]

Message:

Fix 300,000+ leaks seen during the regression tests.

Reviewed by Darin Adler.

EvalCodeCache::get was heap-allocating an EvalExecutable instance without adopting the initial reference.
While fixing this we noticed that EvalExecutable was a RefCounted type that was sometimes stack allocated.
To make this cleaner and to prevent clients from attempting to ref a stack-allocated instance, we move the
refcounting down to a new CacheableEvalExecutable class that derives from EvalExecutable. EvalCodeCache::get
now uses CacheableEvalExecutable::create and avoids the leak.

• bytecode/EvalCodeCache.h:

(JSC::EvalCodeCache::get):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::callEval):

• runtime/Executable.h:

(JSC::CacheableEvalExecutable::create):
(JSC::CacheableEvalExecutable::CacheableEvalExecutable):

File:

• trunk/JavaScriptCore/bytecode/EvalCodeCache.h (modified) (3 diffs)

trunk/JavaScriptCore/bytecode/EvalCodeCache.h

@@ -43 +43 @@
     class EvalCodeCache {
     public:
-        PassRefPtr<EvalExecutable> get(ExecState* exec, const UString& evalSource, ScopeChainNode* scopeChain, JSValue& exceptionValue)
+        PassRefPtr<CacheableEvalExecutable> get(ExecState* exec, const UString& evalSource, ScopeChainNode* scopeChain, JSValue& exceptionValue)
         {
-            RefPtr<EvalExecutable> evalExecutable;
+            RefPtr<CacheableEvalExecutable> evalExecutable;
 
             if (evalSource.size() < maxCacheableSourceLength && (*scopeChain->begin())->isVariableObject())
@@ -51 +51 @@
 
             if (!evalExecutable) {
-                evalExecutable = new EvalExecutable(makeSource(evalSource));
+                evalExecutable = CacheableEvalExecutable::create(makeSource(evalSource));
                 exceptionValue = evalExecutable->parse(exec);
                 if (exceptionValue)
@@ -75 +75 @@
         static const int maxCacheEntries = 64;
 
-        typedef HashMap<RefPtr<UString::Rep>, RefPtr<EvalExecutable> > EvalCacheMap;
+        typedef HashMap<RefPtr<UString::Rep>, RefPtr<CacheableEvalExecutable> > EvalCacheMap;
         EvalCacheMap m_cacheMap;
     };