Changeset 95877 in webkit for trunk/Source/JavaScriptCore/parser

Timestamp:

Sep 23, 2011, 3:59:18 PM (14 years ago)

Author:

[email protected]

Message:

Source/JavaScriptCore: Strict mode does not work in non-trivial nested functions.
​https://bugs.webkit.org/show_bug.cgi?id=68740

Reviewed by Oliver Hunt.

Function-info caching does not preserve all state that it should.

• parser/JSParser.cpp:

(JSC::JSParser::Scope::saveFunctionInfo):
(JSC::JSParser::Scope::restoreFunctionInfo):
(JSC::JSParser::parseFunctionInfo):

• parser/SourceProviderCacheItem.h:

LayoutTests: ​[email protected]>

Strict mode does not work in non-trivial nested functions.
​https://bugs.webkit.org/show_bug.cgi?id=68740

Reviewed by Oliver Hunt.

Function-info caching does not preserve all state that it should.

• fast/js/nested-functions-expected.txt: Added.
• fast/js/nested-functions.html: Added.
• fast/js/script-tests/nested-functions.js: Added.

(runTests.test1):
(runTests.test2):
(runTests.test3):
(runTests):

Location:

trunk/Source/JavaScriptCore/parser

Files:

• JSParser.cpp (modified) (3 diffs)
• SourceProviderCacheItem.h (modified) (1 diff)

trunk/Source/JavaScriptCore/parser/JSParser.cpp

@@ -753 +753 @@
             ASSERT(m_isFunction);
             info->usesEval = m_usesEval;
+            info->strictMode = m_strictMode;
+            info->needsFullActivation = m_needsFullActivation;
             copyCapturedVariablesToVector(m_writtenVariables, info->writtenVariables);
             copyCapturedVariablesToVector(m_usedVariables, info->usedVariables);
@@ -761 +763 @@
             ASSERT(m_isFunction);
             m_usesEval = info->usesEval;
+            m_strictMode = info->strictMode;
+            m_needsFullActivation = info->needsFullActivation;
             unsigned size = info->usedVariables.size();
             for (unsigned i = 0; i < size; ++i)
@@ -1609 +1613 @@
     bodyStartLine = tokenLine();
 
+    // If we know about this function already, we can use the cached info and skip the parser to the end of the function.
     if (const SourceProviderCacheItem* cachedInfo = TreeBuilder::CanUseFunctionCache ? findCachedFunctionInfo(openBracePos) : 0) {
-        // If we know about this function already, we can use the cached info and skip the parser to the end of the function.
-        body = context.createFunctionBody(strictMode());
+        // If we're in a strict context, the cached function info must say it was strict too.
+        ASSERT(!strictMode() || cachedInfo->strictMode);
+        body = context.createFunctionBody(cachedInfo->strictMode);
 
         functionScope->restoreFunctionInfo(cachedInfo);

trunk/Source/JavaScriptCore/parser/SourceProviderCacheItem.h

@@ -60 +60 @@
     int closeBracePos;
     bool usesEval;
+    bool strictMode;
+    bool needsFullActivation;
     Vector<RefPtr<StringImpl> > usedVariables;
     Vector<RefPtr<StringImpl> > writtenVariables;