Changeset 199939 in webkit for trunk/Source/JavaScriptCore/runtime/CodeCache.cpp

Timestamp:

Apr 22, 2016, 5:40:43 PM (9 years ago)

Author:

[email protected]

Message:

Web Inspector: Source directives lost when using Function constructor repeatedly
​https://bugs.webkit.org/show_bug.cgi?id=156863
<rdar://problem/25861064>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-04-22
Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Source directives (sourceURL and sourceMappingURL) are normally accessed through
the SourceProvider and normally set when the script is parsed. However, when a
CodeCache lookup skips parsing, the new SourceProvider never gets the directives
(sourceURL/sourceMappingURL). This patch stores the directives on the UnlinkedCodeBlock
and UnlinkedFunctionExecutable when entering the cache, and copies to the new providers
when the cache is used.

• bytecode/UnlinkedCodeBlock.h:

(JSC::UnlinkedCodeBlock::sourceURLDirective):
(JSC::UnlinkedCodeBlock::sourceMappingURLDirective):
(JSC::UnlinkedCodeBlock::setSourceURLDirective):
(JSC::UnlinkedCodeBlock::setSourceMappingURLDirective):

• bytecode/UnlinkedFunctionExecutable.h:
• parser/SourceProvider.h:
• runtime/CodeCache.cpp:

(JSC::CodeCache::getGlobalCodeBlock):
(JSC::CodeCache::getFunctionExecutableFromGlobalCode):

• runtime/CodeCache.h:

Store directives on the unlinked code block / executable when adding
to the cache, so they can be used to update new providers when the
cache gets used.

• runtime/JSGlobalObject.cpp:

Add needed header after CodeCache header cleanup.

LayoutTests:

• inspector/debugger/sourceURL-repeated-identical-executions-expected.txt: Added.
• inspector/debugger/sourceURL-repeated-identical-executions.html: Added.

File:

• trunk/Source/JavaScriptCore/runtime/CodeCache.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/CodeCache.cpp

@@ -25 +25 @@
 
 #include "config.h"
-
 #include "CodeCache.h"
 
 #include "BytecodeGenerator.h"
-#include "CodeSpecializationKind.h"
-#include "ExecutableInfo.h"
 #include "JSCInlines.h"
 #include "Parser.h"
@@ -100 +97 @@
         unsigned endColumn = unlinkedCodeBlock->endColumn() + (endColumnIsOnStartLine ? startColumn : 1);
         executable->recordParse(unlinkedCodeBlock->codeFeatures(), unlinkedCodeBlock->hasCapturedVariables(), firstLine, firstLine + lineCount, startColumn, endColumn);
+        source.provider()->setSourceURLDirective(unlinkedCodeBlock->sourceURLDirective());
+        source.provider()->setSourceMappingURLDirective(unlinkedCodeBlock->sourceMappingURLDirective());
         return unlinkedCodeBlock;
     }
@@ -119 +118 @@
     UnlinkedCodeBlockType* unlinkedCodeBlock = UnlinkedCodeBlockType::create(&vm, executable->executableInfo());
     unlinkedCodeBlock->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), rootNode->firstLine() - source.firstLine(), lineCount, unlinkedEndColumn);
+    unlinkedCodeBlock->setSourceURLDirective(source.provider()->sourceURL());
+    unlinkedCodeBlock->setSourceMappingURLDirective(source.provider()->sourceMappingURL());
 
     error = BytecodeGenerator::generate(vm, rootNode.get(), unlinkedCodeBlock, debuggerMode, profilerMode, variablesUnderTDZ);
@@ -157 +158 @@
         JSParserStrictMode::NotStrict);
     SourceCodeValue* cache = m_sourceCode.findCacheAndUpdateAge(key);
-    if (cache)
-        return jsCast<UnlinkedFunctionExecutable*>(cache->cell.get());
+    if (cache) {
+        UnlinkedFunctionExecutable* executable = jsCast<UnlinkedFunctionExecutable*>(cache->cell.get());
+        source.provider()->setSourceURLDirective(executable->sourceURLDirective());
+        source.provider()->setSourceMappingURLDirective(executable->sourceMappingURLDirective());
+        return executable;
+    }
 
     JSTextPosition positionBeforeLastNewline;
@@ -194 +199 @@
     UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, metadata, UnlinkedNormalFunction, ConstructAbility::CanConstruct, emptyTDZVariables, DerivedContextType::None);
 
+    functionExecutable->setSourceURLDirective(source.provider()->sourceURL());
+    functionExecutable->setSourceMappingURLDirective(source.provider()->sourceMappingURL());
+
     m_sourceCode.addCache(key, SourceCodeValue(vm, functionExecutable, m_sourceCode.age()));
     return functionExecutable;