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

Timestamp:

May 7, 2012, 4:35:52 PM (13 years ago)

Author:

[email protected]

Message:

2012-05-07 Oliver Hunt <​[email protected]>

Rolling out r110287

RS=Filip Pizlo

r110287 was meant to be refactoring only, but changed behavior
enough to break some websites, including qq.com.

File:

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

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -63 +63 @@
 
     m_functionCache = source.provider()->cache();
-    ScopeFlags scopeFlags = NoScopeFlags;
+    ScopeRef scope = pushScope();
+    if (parserMode == JSParseFunctionCode)
+        scope->setIsFunction();
     if (strictness == JSParseStrict)
-        scopeFlags |= StrictModeFlag;
-    if (parserMode == JSParseFunctionCode)
-        scopeFlags |= FunctionModeFlag;
-    ScopeRef scope = pushScope(scopeFlags);
+        scope->setStrictMode();
     if (parameters) {
         for (unsigned i = 0; i < parameters->size(); i++)
@@ -98 +97 @@
     IdentifierSet capturedVariables;
     scope->getCapturedVariables(capturedVariables);
-    ScopeFlags scopeFlags = scope->modeFlags() | scope->usesFlags();
+    CodeFeatures features = context.features();
+    if (scope->strictMode())
+        features |= StrictModeFeature;
+    if (scope->shadowsArguments())
+        features |= ShadowsArgumentsFeature;
     unsigned functionCacheSize = m_functionCache ? m_functionCache->byteSize() : 0;
     if (functionCacheSize != oldFunctionCacheSize)
         m_lexer->sourceProvider()->notifyCacheSizeChanged(functionCacheSize - oldFunctionCacheSize);
 
-    didFinishParsing(sourceElements, context.varDeclarations(), context.funcDeclarations(), scopeFlags,
+    didFinishParsing(sourceElements, context.varDeclarations(), context.funcDeclarations(), features,
                      m_lastLine, context.numConstants(), capturedVariables);
 
@@ -111 +114 @@
 template <typename LexerType>
 void Parser<LexerType>::didFinishParsing(SourceElements* sourceElements, ParserArenaData<DeclarationStacks::VarStack>* varStack, 
-                              ParserArenaData<DeclarationStacks::FunctionStack>* funcStack, ScopeFlags scopeFlags, int lastLine, int numConstants, IdentifierSet& capturedVars)
+                              ParserArenaData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int lastLine, int numConstants, IdentifierSet& capturedVars)
 {
     m_sourceElements = sourceElements;
@@ -117 +120 @@
     m_funcDeclarations = funcStack;
     m_capturedVariables.swap(capturedVars);
-    m_scopeFlags = scopeFlags;
+    m_features = features;
     m_lastLine = lastLine;
     m_numConstants = numConstants;
@@ -145 +148 @@
                 // "use strict" must be the exact literal without escape sequences or line continuation.
                 if (!hasSetStrict && directiveLiteralLength == lengthOfUseStrictLiteral && m_globalData->propertyNames->useStrictIdentifier == *directive) {
-                    currentScope()->setFlags(StrictModeFlag);
+                    setStrictMode();
                     hasSetStrict = true;
                     failIfFalse(isValidStrictMode());
@@ -253 +256 @@
         bool hasInitializer = match(EQUAL);
         failIfFalseIfStrictWithNameAndMessage(declareVariable(name), "Cannot declare a variable named", name->impl(), "in strict mode.");
-        if (m_globalData->propertyNames->arguments == *name)
-            currentScope()->setFlags(UsesArgumentsFlag);
         context.addVar(name, (hasInitializer || (!m_allowsIn && match(INTOKEN))) ? DeclarationStacks::HasInitializer : 0);
         if (hasInitializer) {
@@ -289 +290 @@
         bool hasInitializer = match(EQUAL);
         declareVariable(name);
-        if (m_globalData->propertyNames->arguments == *name)
-            currentScope()->setFlags(UsesArgumentsFlag);
         context.addVar(name, DeclarationStacks::IsConstant | (hasInitializer ? DeclarationStacks::HasInitializer : 0));
         TreeExpression initializer = 0;
@@ -513 +512 @@
     ASSERT(match(WITH));
     failIfTrueWithMessage(strictMode(), "'with' statements are not valid in strict mode");
-    currentScope()->setFlags(UsesWithFlag);
+    currentScope()->setNeedsFullActivation();
     int startLine = tokenLine();
     next();
@@ -528 +527 @@
     failIfFalse(statement);
     
-    currentScope()->setFlags(UsesWithFlag);
     return context.createWithStatement(m_lexer->lastLineNumber(), expr, statement, start, end, startLine, endLine);
 }
@@ -617 +615 @@
     
     if (match(CATCH)) {
-        currentScope()->setFlags(UsesCatchFlag);
+        currentScope()->setNeedsFullActivation();
         next();
         consumeOrFail(OPENPAREN);
@@ -623 +621 @@
         ident = m_token.m_data.ident;
         next();
-        AutoPopScopeRef catchScope(this, pushScope(currentScope()->modeFlags()));
+        AutoPopScopeRef catchScope(this, pushScope());
         failIfFalseIfStrictWithNameAndMessage(declareVariable(ident), "Cannot declare a variable named", ident->impl(), "in strict mode");
-        currentScope()->setFlags(BlockScopeFlag | UsesCatchFlag);
+        catchScope->preventNewDecls();
         consumeOrFail(CLOSEPAREN);
         matchOrFail(OPENBRACE);
@@ -762 +760 @@
 {
     if (match(CLOSEBRACE))
-        return context.createFunctionBody(m_lexer->lastLineNumber(), currentScope()->modeFlags());
+        return context.createFunctionBody(m_lexer->lastLineNumber(), strictMode());
     DepthManager statementDepth(&m_statementDepth);
     m_statementDepth = 0;
@@ -773 +771 @@
 template <FunctionRequirements requirements, bool nameIsInContainingScope, class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, const Identifier*& name, TreeFormalParameterList& parameters, TreeFunctionBody& body, int& openBracePos, int& closeBracePos, int& bodyStartLine)
 {
-    AutoPopScopeRef functionScope(this, pushScope(currentScope()->modeFlags() | FunctionModeFlag));
+    AutoPopScopeRef functionScope(this, pushScope());
+    functionScope->setIsFunction();
     if (match(IDENT)) {
         name = m_token.m_data.ident;
@@ -795 +794 @@
     if (const SourceProviderCacheItem* cachedInfo = TreeBuilder::CanUseFunctionCache ? findCachedFunctionInfo(openBracePos) : 0) {
         // If we're in a strict context, the cached function info must say it was strict too.
-        ASSERT(!strictMode() || (cachedInfo->scopeFlags & StrictModeFlag));
-        body = context.createFunctionBody(m_lexer->lastLineNumber(), cachedInfo->scopeFlags);
+        ASSERT(!strictMode() || cachedInfo->strictMode);
+        body = context.createFunctionBody(m_lexer->lastLineNumber(), cachedInfo->strictMode);
         
         functionScope->restoreFunctionInfo(cachedInfo);
@@ -856 +855 @@
     failIfFalse(name);
     failIfFalseIfStrict(declareVariable(name));
-    if (*name == m_globalData->propertyNames->arguments)
-        currentScope()->setFlags(UsesArgumentsFlag);
     return context.createFuncDeclStatement(m_lexer->lastLineNumber(), name, body, parameters, openBracePos, closeBracePos, bodyStartLine, m_lastLine);
 }
@@ -1417 +1414 @@
     case THISTOKEN: {
         next();
-        currentScope()->setFlags(UsesThisFlag);
         return context.thisExpr(m_lexer->lastLineNumber());
     }
@@ -1424 +1420 @@
         const Identifier* ident = m_token.m_data.ident;
         next();
-        if (m_globalData->propertyNames->eval == *ident)
-            currentScope()->setFlags(UsesEvalFlag);
-        else if (m_globalData->propertyNames->arguments == *ident)
-            currentScope()->setFlags(UsesArgumentsFlag);
-        currentScope()->useVariable(ident);
+        currentScope()->useVariable(ident, m_globalData->propertyNames->eval == *ident);
         m_lastIdentifier = ident;
         return context.createResolve(m_lexer->lastLineNumber(), ident, start);