Changeset 163225 in webkit for trunk/Source/JavaScriptCore/parser/Parser.h

Timestamp:

Jan 31, 2014, 5:37:59 PM (12 years ago)

Author:

[email protected]

Message:

2014-01-31 Oliver Hunt <​[email protected]>

Rollout r163195 and related patches

File:

• trunk/Source/JavaScriptCore/parser/Parser.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -24 +24 @@
 #define Parser_h
 
-#include "CommonIdentifiers.h"
 #include "Debugger.h"
 #include "ExceptionHelpers.h"
@@ -261 +260 @@
     }
 
-    void getUsedVariables(IdentifierSet& usedVariables)
-    {
-        usedVariables.swap(m_usedVariables);
-    }
 
     void useVariable(const Identifier* ident, bool isEval)
@@ -420 +415 @@
 
     JSTextPosition positionBeforeLastNewline() const { return m_lexer->positionBeforeLastNewline(); }
-    const Vector<RefPtr<StringImpl>>&& closedVariables() { return std::move(m_closedVariables); }
 
 private:
@@ -547 +541 @@
 
     void didFinishParsing(SourceElements*, ParserArenaData<DeclarationStacks::VarStack>*, 
-        ParserArenaData<DeclarationStacks::FunctionStack>*, CodeFeatures, int, IdentifierSet&, const Vector<RefPtr<StringImpl>>&&);
+        ParserArenaData<DeclarationStacks::FunctionStack>*, CodeFeatures, int, IdentifierSet&);
 
     // Used to determine type of error to report.
@@ -847 +841 @@
     RefPtr<SourceProviderCache> m_functionCache;
     SourceElements* m_sourceElements;
-    bool m_parsingBuiltin;
     ParserArenaData<DeclarationStacks::VarStack>* m_varDeclarations;
     ParserArenaData<DeclarationStacks::FunctionStack>* m_funcDeclarations;
     IdentifierSet m_capturedVariables;
-    Vector<RefPtr<StringImpl>> m_closedVariables;
     CodeFeatures m_features;
     int m_numConstants;
@@ -966 +958 @@
         if (positionBeforeLastNewline)
             *positionBeforeLastNewline = parser.positionBeforeLastNewline();
-        if (strictness == JSParseBuiltin) {
-            RELEASE_ASSERT(result);
-            result->setClosedVariables(std::move(parser.closedVariables()));
-        }
         return result.release();
     }