Changeset 167313 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

Apr 15, 2014, 10:46:42 AM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r167199 and r167251.
​https://bugs.webkit.org/show_bug.cgi?id=131678

Caused a DYEBench regression and does not seem to improve perf
on relevant websites (Requested by rniwa on #webkit).

Reverted changesets:

"Rewrite Function.bind as a builtin"
​https://bugs.webkit.org/show_bug.cgi?id=131083
​http://trac.webkit.org/changeset/167199

"Update test result"
​http://trac.webkit.org/changeset/167251

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -193 +193 @@
 
 template <typename LexerType>
-Parser<LexerType>::Parser(VM* vm, const SourceCode& source, FunctionParameters* parameters, const Identifier& name, JSParserStrictness strictness, JSParserMode parserMode, JSFunctionKind functionKind)
+Parser<LexerType>::Parser(VM* vm, const SourceCode& source, FunctionParameters* parameters, const Identifier& name, JSParserStrictness strictness, JSParserMode parserMode)
     : m_vm(vm)
     , m_source(&source)
@@ -208 +208 @@
     , m_parsingBuiltin(strictness == JSParseBuiltin)
 {
-    m_lexer = adoptPtr(new LexerType(vm, strictness, functionKind));
+    m_lexer = adoptPtr(new LexerType(vm, strictness));
     m_arena = m_vm->parserArena.get();
     m_lexer->setCode(source, m_arena);
@@ -284 +284 @@
     Vector<RefPtr<StringImpl>> closedVariables;
     if (m_parsingBuiltin) {
+        RELEASE_ASSERT(!capturedVariables.size());
         IdentifierSet usedVariables;
         scope->getUsedVariables(usedVariables);
@@ -293 +294 @@
                 continue;
             closedVariables.append(variable);
-        }
-        if (!capturedVariables.isEmpty()) {
-            for (const auto& capturedVariable : capturedVariables) {
-                if (scope->hasDeclaredVariable(Identifier(m_vm, capturedVariable.get())))
-                    continue;
-                
-                if (scope->hasDeclaredParameter(Identifier(m_vm, capturedVariable.get())))
-                    continue;
-                RELEASE_ASSERT_NOT_REACHED();
-            }
         }
     }