Changeset 136860 in webkit

Timestamp:

Dec 6, 2012 11:26:20 AM (11 years ago)

Author:

oliver@apple.com

Message:

Remove harmful string->function cache
​https://bugs.webkit.org/show_bug.cgi?id=104193

Reviewed by Alexey Proskuryakov.

Remove the string->function code cache that turned out to actually
be quite harmful.

• runtime/CodeCache.cpp:

(JSC::CodeCache::getFunctionCodeBlock):

• runtime/CodeCache.h:

(JSC::CodeCache::clear):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/ASTBuilder.h (modified) (1 diff)
• parser/Nodes.cpp (modified) (1 diff)
• parser/Nodes.h (modified) (3 diffs)
• parser/Parser.cpp (modified) (2 diffs)
• parser/Parser.h (modified) (1 diff)
• parser/SyntaxChecker.h (modified) (1 diff)
• runtime/CodeCache.cpp (modified) (1 diff)
• runtime/CodeCache.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-12-05  Oliver Hunt  <oliver@apple.com>
+
+        Remove harmful string->function cache
+        https://bugs.webkit.org/show_bug.cgi?id=104193
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove the string->function code cache that turned out to actually
+        be quite harmful.
+
+        * runtime/CodeCache.cpp:
+        (JSC::CodeCache::getFunctionCodeBlock):
+        * runtime/CodeCache.h:
+        (JSC::CodeCache::clear):
+
 2012-12-05  Halton Huo  <halton.huo@intel.com>
 

trunk/Source/JavaScriptCore/parser/ASTBuilder.h

@@ -268 +268 @@
         return FunctionBodyNode::create(m_globalData, location, inStrictContext);
     }
-
-    void setFunctionStart(FunctionBodyNode* body, int functionStart)
-    {
-        body->setFunctionStart(functionStart);
-    }
     
     template <bool> PropertyNode* createGetterOrSetterProperty(const JSTokenLocation& location, PropertyNode::Type type, const Identifier* name, ParameterNode* params, FunctionBodyNode* body, int openBracePos, int closeBracePos, int bodyStartLine, int bodyEndLine)

trunk/Source/JavaScriptCore/parser/Nodes.cpp

@@ -42 +42 @@
 #include "RegExpObject.h"
 #include "SamplingTool.h"
-#include "SourceProviderCacheItem.h"
 #include <wtf/Assertions.h>
 #include <wtf/RefCountedLeakCounter.h>

trunk/Source/JavaScriptCore/parser/Nodes.h

@@ -47 +47 @@
     class JSScope;
     class ScopeNode;
-    class SourceProviderCacheItem;
 
     typedef unsigned CodeFeatures;
@@ -1426 +1425 @@
         FunctionNameIsInScopeToggle functionNameIsInScopeToggle() { return m_functionNameIsInScopeToggle; }
 
-        void setFunctionStart(int functionStart) { m_functionStart = functionStart; }
-        int functionStart() const { return m_functionStart; }
-
         static const bool scopeIsFunction = true;
 
@@ -1439 +1435 @@
         FunctionNameIsInScopeToggle m_functionNameIsInScopeToggle;
         RefPtr<FunctionParameters> m_parameters;
-        int m_functionStart;
     };
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -843 +843 @@
         
         closeBracePos = cachedInfo->closeBracePos;
-        context.setFunctionStart(body, functionStart);
         m_token = cachedInfo->closeBraceToken();
         m_lexer->setOffset(m_token.m_location.endOffset);
@@ -871 +870 @@
         functionScope->saveFunctionInfo(newInfo.get());
     }
-    context.setFunctionStart(body, functionStart);
-
+    
     failIfFalse(popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo));
     matchOrFail(CLOSEBRACE);

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -510 +510 @@
     ScopeStack m_scopeStack;
     
-    const SourceProviderCacheItem* findCachedFunctionInfo(int openBracePos)
+    const SourceProviderCacheItem* findCachedFunctionInfo(int openBracePos) 
     {
         return m_functionCache ? m_functionCache->get(openBracePos) : 0;

trunk/Source/JavaScriptCore/parser/SyntaxChecker.h

@@ -152 +152 @@
     ExpressionType createFunctionExpr(const JSTokenLocation&, const Identifier*, int, int, int, int, int, int) { return FunctionExpr; }
     int createFunctionBody(const JSTokenLocation&, bool) { return 1; }
-    void setFunctionStart(int, int) { }
     int createArguments() { return 1; }
     int createArguments(int) { return 1; }

trunk/Source/JavaScriptCore/runtime/CodeCache.cpp

@@ -133 +133 @@
 UnlinkedFunctionCodeBlock* CodeCache::getFunctionCodeBlock(JSGlobalData& globalData, UnlinkedFunctionExecutable* executable, const SourceCode& source, CodeSpecializationKind kind, DebuggerMode debuggerMode, ProfilerMode profilerMode, ParserError& error)
 {
-    if (debuggerMode == DebuggerOn || profilerMode == ProfilerOn)
-        return generateFunctionCodeBlock(globalData, executable, source, kind, debuggerMode, profilerMode, error);
-
-    SourceCode functionSource(source.provider(), executable->functionStartOffset(), source.endOffset(), source.firstLine());
-    CodeBlockKey key = makeCodeBlockKey(functionSource, kind == CodeForCall ? FunctionCallType : FunctionConstructType, executable->isInStrictContext() ? JSParseStrict : JSParseNormal);
-    if (const Strong<UnlinkedFunctionCodeBlock>* cacheEntry = m_cachedFunctionExecutables.find(key)) {
-        if (cacheEntry) {
-            UnlinkedFunctionCodeBlock* unlinkedCode = cacheEntry->get();
-            unsigned firstLine = source.firstLine() + unlinkedCode->firstLine();
-            executable->recordParse(unlinkedCode->codeFeatures(), unlinkedCode->hasCapturedVariables(), firstLine, firstLine + unlinkedCode->lineCount());
-            m_recentlyUsedFunctionCode.add(unlinkedCode, *cacheEntry);
-            return unlinkedCode;
-        }
-    }
-    UnlinkedFunctionCodeBlock* result = generateFunctionCodeBlock(globalData, executable, source, kind, debuggerMode, profilerMode, error);
-    m_cachedFunctionExecutables.add(key, Strong<UnlinkedFunctionCodeBlock>(globalData, result));
-    return result;
+    return generateFunctionCodeBlock(globalData, executable, source, kind, debuggerMode, profilerMode, error);
 }
 

trunk/Source/JavaScriptCore/runtime/CodeCache.h

@@ -114 +114 @@
     {
         m_cachedCodeBlocks.clear();
-        m_cachedFunctionExecutables.clear();
         m_cachedGlobalFunctions.clear();
         m_recentlyUsedFunctionCode.clear();
@@ -139 +138 @@
 
     CacheMap<CodeBlockKey, Strong<UnlinkedCodeBlock>, kMaxCodeBlockEntries> m_cachedCodeBlocks;
-    CacheMap<CodeBlockKey, Strong<UnlinkedFunctionCodeBlock>, kMaxFunctionCodeBlocks> m_cachedFunctionExecutables;
     CacheMap<GlobalFunctionKey, Strong<UnlinkedFunctionExecutable>, kMaxFunctionCodeBlocks> m_cachedGlobalFunctions;
     CacheMap<UnlinkedFunctionCodeBlock*, Strong<UnlinkedFunctionCodeBlock>, kMaxFunctionCodeBlocks> m_recentlyUsedFunctionCode;