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

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.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/CodeCache.h

@@ -27 +27 @@
 #define CodeCache_h
 
-#include "CodeSpecializationKind.h"
 #include "ExecutableInfo.h"
 #include "ParserModes.h"
@@ -35 +34 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/Forward.h>
-#include <wtf/RandomNumber.h>
-#include <wtf/WeakRandom.h>
 #include <wtf/text/WTFString.h>
 
@@ -42 +39 @@
 
 class EvalExecutable;
-class FunctionMetadataNode;
 class Identifier;
-class JSScope;
+class ModuleProgramExecutable;
 class ParserError;
 class ProgramExecutable;
-class ModuleProgramExecutable;
+class SourceCode;
 class UnlinkedCodeBlock;
 class UnlinkedEvalCodeBlock;
+class UnlinkedFunctionExecutable;
 class UnlinkedModuleProgramCodeBlock;
-class UnlinkedFunctionCodeBlock;
-class UnlinkedFunctionExecutable;
 class UnlinkedProgramCodeBlock;
 class VM;
-class SourceCode;
-class SourceProvider;
 class VariableEnvironment;