<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206653] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206653">206653</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-30 12:22:50 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Breakpoints on blank lines or comments don't break
https://bugs.webkit.org/show_bug.cgi?id=9885
<rdar://problem/6134406>
Reviewed by Mark Lam.
Source/JavaScriptCore:
This change introduces a way to perform a Debugger Parse of a script.
This debugger parse gathers a list of breakpoint locations, which
the backend uses to resolve breakpoint locations that came from the
Inspector frontend to the exact location we would actually pause.
We gather this information from the parser so that we can eagerly
get this information without requiring the code to have executed (the
real op_debugs are generated during bytecode generation when code
is actually evaluated).
If an input location was on a line with whitespace or a comment, the
resolved breakpoint location would be before the next statement that
will be executed. That may be the next line, or even later. We also
update our policy when setting breakpoints on and around function
statements to better match user expectations.
For example, when resolving breakpoints in:
1. // Comment
2. before;
3.
4. function foo() {
5. inside;
6. }
7.
8. after;
A breakpoint on line 1, a comment, resolves to line 2 the next
statement that will execute.
A breakpoint on line 3 or 7, empty lines, resolves to line 8 the next
statement that will execute. This skips past the definition of foo,
just like stepping would have done. The creation of foo would have
been hoisted, which would have happened before execution of the
other statements.
A breakpoint on line 4, a function signature, resolves to line 5,
inside the function. Users would expect to pause inside of a function
when setting a breakpoint on that function's name or opening brace.
A breakpoint on line 6, a function's closing brace, resolves to
line 6. The debugger will pause whenever execution leaves foo due to
a return and not an exception. This matches stepping behavior. An
explicit or implicit return (the implicit return undefined) will
pause on the closing brace as we leave the function, giving users
an opportunity to inspect the final state before leaving.
--
At this point, op_debug's are still emitted at custom locations during
bytecode generation of other statements / expressions. In order to
ensure the generated op_debugs correspond to locations the Parser
determined were breakpoint locations, the Parser sets a "needs debug
hook" flag on the nodes it will use for breakpoint locations, and
we assert during bytecode generation that op_debugs are only emitted
for nodes that were marked as needing debug hooks.
This still leaves open the possibility that the Parser will mark
some nodes that get missed during bytecode generation, so we might
fail to emit some op_debugs. The next step will be eliminating the
custom emitDebugHooks spread across StatementNode and ExpressionNode
subclasses, and instead always generating op_debugs whenever we
emit a flagged node.
--
* CMakeLists.txt:
* JavaScriptCore.xcodeproj/project.pbxproj:
New DebuggerParseData files.
* API/JSScriptRef.cpp:
(OpaqueJSScript::OpaqueJSScript):
* jsc.cpp:
(functionCheckModuleSyntax):
* parser/SourceCode.h:
(JSC::makeSource):
* parser/SourceProvider.cpp:
(JSC::SourceProvider::SourceProvider):
* parser/SourceProvider.h:
(JSC::SourceProvider::sourceType):
(JSC::StringSourceProvider::create):
(JSC::StringSourceProvider::StringSourceProvider):
(JSC::WebAssemblySourceProvider::WebAssemblySourceProvider):
(JSC::SourceProvider::startPosition): Deleted.
Add a new type on SourceProvider to distinguish if its script was
intended to be a Script, Module, or WebAssembly. This information
will be needed to know how to best parse this file when the
debugger decides to lazily parse.
* runtime/Executable.cpp:
(JSC::EvalExecutable::EvalExecutable):
(JSC::ProgramExecutable::ProgramExecutable):
(JSC::ModuleProgramExecutable::ModuleProgramExecutable):
(JSC::WebAssemblyExecutable::WebAssemblyExecutable):
* runtime/ModuleLoaderPrototype.cpp:
(JSC::moduleLoaderPrototypeParseModule):
ASSERT the SourceProvider type matches the executable type we are
creating for it.
* parser/ASTBuilder.h:
(JSC::ASTBuilder::breakpointLocation):
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::operatorStackPop):
When gathering breakpoint positions, get the position from the
current node. In the SyntaxChecker, return an invalid position.
* parser/Nodes.h:
(JSC::ExpressionNode::needsDebugHook):
(JSC::ExpressionNode::setNeedsDebugHook):
(JSC::StatementNode::needsDebugHook):
(JSC::StatementNode::setNeedsDebugHook):
When gathering breakpoint positions, mark the node as needing
a debug hook. For now we assert op_debugs generated must come
from these nodes. Later we should just generate op_debugs for
these nodes.
* parser/Parser.cpp:
(JSC::Parser<LexerType>::Parser):
(JSC::Parser<LexerType>::parseStatementListItem):
(JSC::Parser<LexerType>::parseDoWhileStatement):
(JSC::Parser<LexerType>::parseWhileStatement):
(JSC::Parser<LexerType>::parseArrowFunctionSingleExpressionBodySourceElements):
(JSC::Parser<LexerType>::parseForStatement):
(JSC::Parser<LexerType>::parseWithStatement):
(JSC::Parser<LexerType>::parseSwitchStatement):
(JSC::Parser<LexerType>::parseStatement):
(JSC::Parser<LexerType>::parseFunctionBody):
(JSC::Parser<LexerType>::parseFunctionInfo):
(JSC::Parser<LexerType>::parseIfStatement):
(JSC::Parser<LexerType>::parseAssignmentExpression):
* parser/Parser.h:
(JSC::parse):
Add an optional DebuggerParseData struct to the Parser. When available
the Parser will gather debugger data, and parse all functions with the
ASTBuilder instead of SyntaxChecking inner functions.
* debugger/DebuggerParseData.cpp: Added.
(JSC::DebuggerPausePositions::breakpointLocationForLineColumn):
(JSC::DebuggerPausePositions::sort):
(JSC::gatherDebuggerParseData):
(JSC::gatherDebuggerParseDataForSource):
* debugger/DebuggerParseData.h: Copied from Source/JavaScriptCore/debugger/DebuggerPrimitives.h.
(JSC::DebuggerPausePositions::DebuggerPausePositions):
(JSC::DebuggerPausePositions::appendPause):
(JSC::DebuggerPausePositions::appendEntry):
(JSC::DebuggerPausePositions::appendLeave):
The DebuggerParseData struct currently only contains a list of pause positions.
Once populated it can resolve an input location to a pause position.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitCall):
(JSC::BytecodeGenerator::emitCallVarargs):
(JSC::BytecodeGenerator::emitDebugHook):
(JSC::BytecodeGenerator::emitEnumeration):
* bytecompiler/BytecodeGenerator.h:
* bytecompiler/NodesCodegen.cpp:
(JSC::EmptyStatementNode::emitBytecode):
(JSC::DebuggerStatementNode::emitBytecode):
(JSC::ExprStatementNode::emitBytecode):
(JSC::DeclarationStatement::emitBytecode):
(JSC::IfElseNode::emitBytecode):
(JSC::DoWhileNode::emitBytecode):
(JSC::WhileNode::emitBytecode):
(JSC::ForNode::emitBytecode):
(JSC::ForInNode::emitBytecode):
(JSC::ContinueNode::emitBytecode):
(JSC::BreakNode::emitBytecode):
(JSC::ReturnNode::emitBytecode):
(JSC::WithNode::emitBytecode):
(JSC::SwitchNode::emitBytecode):
(JSC::ThrowNode::emitBytecode):
Emit op_debugs for the nodes themselves. Assert when we do that the
Parser had marked them as needing a debug hook.
* debugger/Breakpoint.h:
(JSC::Breakpoint::Breakpoint):
A breakpoint may be resolved or unresolved. Debugger::resolveBreakpoint
must be used to resolve the breakpoint. Most methods now require a
resolved breakpoint.
* debugger/Debugger.h:
* debugger/Debugger.cpp:
(JSC::Debugger::detach):
(JSC::Debugger::toggleBreakpoint):
(JSC::Debugger::debuggerParseData):
(JSC::Debugger::resolveBreakpoint):
(JSC::Debugger::setBreakpoint):
(JSC::Debugger::clearParsedData):
Provide a public method to resolve a breakpoint location in a script.
This will gather debugger parse data for the script if none is available.
Ensure clients have resolved a breakpoint before attempting to set it.
Currently we allow only a single breakpoint at a location. This may
need to change if multiple breakpoints resolve to the same location
but have different actions.
* inspector/ScriptDebugListener.h:
ScriptDebugServer::Script is effectively duplicating most of the data from
a SourceProvider. We should eliminate this and just use SourceProvider.
* inspector/ScriptDebugServer.cpp:
(Inspector::ScriptDebugServer::setBreakpointActions):
(Inspector::ScriptDebugServer::removeBreakpointActions):
(Inspector::ScriptDebugServer::getActionsForBreakpoint):
(Inspector::ScriptDebugServer::clearBreakpointActions):
(Inspector::ScriptDebugServer::evaluateBreakpointAction):
(Inspector::ScriptDebugServer::dispatchDidParseSource):
(Inspector::ScriptDebugServer::handleBreakpointHit):
(Inspector::ScriptDebugServer::setBreakpoint): Deleted.
(Inspector::ScriptDebugServer::removeBreakpoint): Deleted.
(Inspector::ScriptDebugServer::clearBreakpoints): Deleted.
* inspector/ScriptDebugServer.h:
Reduce ScriptDebugServer's involvement in breakpoints to just handling
breakpoint actions. Eventually we should eliminate it alltogether and
fold breakpoint logic into Debugger or DebugAgent.
* inspector/agents/InspectorDebuggerAgent.h:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::buildDebuggerLocation):
(Inspector::parseLocation):
(Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
(Inspector::InspectorDebuggerAgent::setBreakpoint):
(Inspector::InspectorDebuggerAgent::didSetBreakpoint):
(Inspector::InspectorDebuggerAgent::resolveBreakpoint):
(Inspector::InspectorDebuggerAgent::removeBreakpoint):
(Inspector::InspectorDebuggerAgent::continueToLocation):
(Inspector::InspectorDebuggerAgent::didParseSource):
(Inspector::InspectorDebuggerAgent::clearDebuggerBreakpointState):
The Inspector can set breakpoints in multiple ways.
Ensure that once we have the Script that we always
resolve the breakpoint location before setting the
breakpoint. The different paths are:
- setBreakpoint(scriptId, location)
- Here we know the SourceProvider by its SourceID
- resolve and set
- setBreakpointByURL(url, location)
- Search for existing Scripts that match the URL
- resolve in each and set
- When new Scripts are parsed that match the URL
- resolve and set
Source/WebCore:
Tests: inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html
inspector/debugger/breakpoints/resolved-dump-each-line.html
* bindings/js/CachedScriptSourceProvider.h:
(WebCore::CachedScriptSourceProvider::CachedScriptSourceProvider):
LayoutTests:
* inspector/debugger/breakpoints/resolved-dump-all-pause-locations-expected.txt: Added.
* inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html: Added.
* inspector/debugger/breakpoints/resolved-dump-each-line-expected.txt: Added.
* inspector/debugger/breakpoints/resolved-dump-each-line.html: Added.
* inspector/debugger/breakpoints/resources/dump-functions.js: Added.
* inspector/debugger/breakpoints/resources/dump-general.js: Added.
Test for resolved breakpoint locations in all kinds of different source code.
* inspector/debugger/breakpoints/resources/dump.js: Added.
(TestPage.registerInitializer):
(TestPage.registerInitializer.window.addDumpAllPauseLocationsTestCase):
(TestPage.registerInitializer.window.addDumpEachLinePauseLocationTestCase):
Shared code to run different generalized tests for logging all resolved
breakpoint locations or the resolved breakpoint location if a breakpoint
is set on each individual line.
* inspector/debugger/resources/log-pause-location.js:
(TestPage.registerInitializer.insertCaretIntoStringAtIndex):
(TestPage.registerInitializer.window.findScript):
(TestPage.registerInitializer.window.loadLinesFromSourceCode):
(TestPage.registerInitializer.window.loadMainPageContent):
(TestPage.registerInitializer.window.logResolvedBreakpointLinesWithContext):
(TestPage.registerInitializer.window.logLinesWithContext):
Make some more code shared and provide a way to log two locations,
used to see where a breakpoint was set and where it resolved to.
* inspector/debugger/setBreakpoint-expected.txt:
Update error message. Should not include a period.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerresourceslogpauselocationjs">trunk/LayoutTests/inspector/debugger/resources/log-pause-location.js</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggersetBreakpointexpectedtxt">trunk/LayoutTests/inspector/debugger/setBreakpoint-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSScriptRefcpp">trunk/Source/JavaScriptCore/API/JSScriptRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerBreakpointh">trunk/Source/JavaScriptCore/debugger/Breakpoint.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerh">trunk/Source/JavaScriptCore/debugger/Debugger.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugListenerh">trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServercpp">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServerh">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceCodeh">trunk/Source/JavaScriptCore/parser/SourceCode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceProvidercpp">trunk/Source/JavaScriptCore/parser/SourceProvider.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceProviderh">trunk/Source/JavaScriptCore/parser/SourceProvider.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSyntaxCheckerh">trunk/Source/JavaScriptCore/parser/SyntaxChecker.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutablecpp">trunk/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeModuleLoaderPrototypecpp">trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsCachedScriptSourceProviderh">trunk/Source/WebCore/bindings/js/CachedScriptSourceProvider.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/inspector/debugger/breakpoints/</li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointsresolveddumpallpauselocationsexpectedtxt">trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointsresolveddumpallpauselocationshtml">trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointsresolveddumpeachlineexpectedtxt">trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-each-line-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointsresolveddumpeachlinehtml">trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-each-line.html</a></li>
<li>trunk/LayoutTests/inspector/debugger/breakpoints/resources/</li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointsresourcesdumpfunctionsjs">trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-functions.js</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointsresourcesdumpgeneraljs">trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-general.js</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakpointsresourcesdumpjs">trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump.js</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerParseDatacpp">trunk/Source/JavaScriptCore/debugger/DebuggerParseData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerParseDatah">trunk/Source/JavaScriptCore/debugger/DebuggerParseData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/LayoutTests/ChangeLog 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Breakpoints on blank lines or comments don't break
+ https://bugs.webkit.org/show_bug.cgi?id=9885
+ <rdar://problem/6134406>
+
+ Reviewed by Mark Lam.
+
+ * inspector/debugger/breakpoints/resolved-dump-all-pause-locations-expected.txt: Added.
+ * inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html: Added.
+ * inspector/debugger/breakpoints/resolved-dump-each-line-expected.txt: Added.
+ * inspector/debugger/breakpoints/resolved-dump-each-line.html: Added.
+ * inspector/debugger/breakpoints/resources/dump-functions.js: Added.
+ * inspector/debugger/breakpoints/resources/dump-general.js: Added.
+ Test for resolved breakpoint locations in all kinds of different source code.
+
+ * inspector/debugger/breakpoints/resources/dump.js: Added.
+ (TestPage.registerInitializer):
+ (TestPage.registerInitializer.window.addDumpAllPauseLocationsTestCase):
+ (TestPage.registerInitializer.window.addDumpEachLinePauseLocationTestCase):
+ Shared code to run different generalized tests for logging all resolved
+ breakpoint locations or the resolved breakpoint location if a breakpoint
+ is set on each individual line.
+
+ * inspector/debugger/resources/log-pause-location.js:
+ (TestPage.registerInitializer.insertCaretIntoStringAtIndex):
+ (TestPage.registerInitializer.window.findScript):
+ (TestPage.registerInitializer.window.loadLinesFromSourceCode):
+ (TestPage.registerInitializer.window.loadMainPageContent):
+ (TestPage.registerInitializer.window.logResolvedBreakpointLinesWithContext):
+ (TestPage.registerInitializer.window.logLinesWithContext):
+ Make some more code shared and provide a way to log two locations,
+ used to see where a breakpoint was set and where it resolved to.
+
+ * inspector/debugger/setBreakpoint-expected.txt:
+ Update error message. Should not include a period.
+
+2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Stepping out of a function finishes the line that called it.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155325
</span><span class="cx"> <rdar://problem/25094578>
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/LayoutTests/TestExpectations 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -139,6 +139,8 @@
</span><span class="cx"> webkit.org/b/161951 [ Debug ] inspector/debugger/stepping [ Skip ]
</span><span class="cx"> webkit.org/b/161951 [ Release ] inspector/debugger/stepping [ Slow ]
</span><span class="cx">
</span><ins>+[ Debug ] inspector/debugger/breakpoints [ Slow ]
+
</ins><span class="cx"> webkit.org/b/129639 inspector/dom/dom-search-crash.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/128736 inspector/debugger/setBreakpoint-dfg.html [ Failure Pass ]
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointsresolveddumpallpauselocationsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations-expected.txt (0 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations-expected.txt 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -0,0 +1,2300 @@
</span><ins>+Checking all resolved breakpoint locations in a script.
+
+
+== Running test suite: Debugger.resolvedBreakpoint.dumpAllLocations
+-- Running test case: Debugger.resolvedBreakpoint.dumpAllLocations.General
+
+INSERTING AT: 0:0
+PAUSES AT: 0:0
+-=> 0 |let a=function(){return 0}
+ 1 let b=function(){return 0}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+
+INSERTING AT: 0:1
+PAUSES AT: 0:17
+-=> 0 l#et a=function(){|return 0}
+ 1 let b=function(){return 0}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+
+INSERTING AT: 0:18
+PAUSES AT: 0:25
+-=> 0 let a=function(){r#eturn 0|}
+ 1 let b=function(){return 0}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+
+INSERTING AT: 0:26
+PAUSES AT: 1:0
+ -> 0 let a=function(){return 0}#
+ => 1 |let b=function(){return 0}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+ 4 let obj={};
+
+INSERTING AT: 1:1
+PAUSES AT: 1:17
+ 0 let a=function(){return 0}
+-=> 1 l#et b=function(){|return 0}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+ 4 let obj={};
+
+INSERTING AT: 1:18
+PAUSES AT: 1:25
+ 0 let a=function(){return 0}
+-=> 1 let b=function(){r#eturn 0|}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+ 4 let obj={};
+
+INSERTING AT: 1:26
+PAUSES AT: 2:0
+ 0 let a=function(){return 0}
+ -> 1 let b=function(){return 0}#
+ => 2 |let c=function(){return 0}
+ 3 let arr=[];
+ 4 let obj={};
+ 5
+
+INSERTING AT: 2:1
+PAUSES AT: 2:17
+ 0 let a=function(){return 0}
+ 1 let b=function(){return 0}
+-=> 2 l#et c=function(){|return 0}
+ 3 let arr=[];
+ 4 let obj={};
+ 5
+
+INSERTING AT: 2:18
+PAUSES AT: 2:25
+ 0 let a=function(){return 0}
+ 1 let b=function(){return 0}
+-=> 2 let c=function(){r#eturn 0|}
+ 3 let arr=[];
+ 4 let obj={};
+ 5
+
+INSERTING AT: 2:26
+PAUSES AT: 3:0
+ 0 let a=function(){return 0}
+ 1 let b=function(){return 0}
+ -> 2 let c=function(){return 0}#
+ => 3 |let arr=[];
+ 4 let obj={};
+ 5
+ 6 // Control flow
+
+INSERTING AT: 3:1
+PAUSES AT: 4:0
+ 0 let a=function(){return 0}
+ 1 let b=function(){return 0}
+ 2 let c=function(){return 0}
+ -> 3 l#et arr=[];
+ => 4 |let obj={};
+ 5
+ 6 // Control flow
+ 7
+
+INSERTING AT: 4:1
+PAUSES AT: 8:4
+ 1 let b=function(){return 0}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+ -> 4 l#et obj={};
+ 5
+ 6 // Control flow
+ 7
+ => 8 if (|0)
+ 9 a();
+ 10
+ 11 if (0) {
+
+INSERTING AT: 8:5
+PAUSES AT: 9:4
+ 5
+ 6 // Control flow
+ 7
+ -> 8 if (0#)
+ => 9 |a();
+ 10
+ 11 if (0) {
+ 12 a();
+
+INSERTING AT: 9:5
+PAUSES AT: 11:4
+ 6 // Control flow
+ 7
+ 8 if (0)
+ -> 9 a#();
+ 10
+ => 11 if (|0) {
+ 12 a();
+ 13 }
+ 14
+
+INSERTING AT: 11:5
+PAUSES AT: 12:4
+ 8 if (0)
+ 9 a();
+ 10
+ -> 11 if (0#) {
+ => 12 |a();
+ 13 }
+ 14
+ 15 if (0)
+
+INSERTING AT: 12:5
+PAUSES AT: 15:4
+ 9 a();
+ 10
+ 11 if (0) {
+ -> 12 a#();
+ 13 }
+ 14
+ => 15 if (|0)
+ 16 a();
+ 17 else if (0)
+ 18 a();
+
+INSERTING AT: 15:5
+PAUSES AT: 16:4
+ 12 a();
+ 13 }
+ 14
+ -> 15 if (0#)
+ => 16 |a();
+ 17 else if (0)
+ 18 a();
+ 19 else
+
+INSERTING AT: 16:5
+PAUSES AT: 17:9
+ 13 }
+ 14
+ 15 if (0)
+ -> 16 a#();
+ => 17 else if (|0)
+ 18 a();
+ 19 else
+ 20 a();
+
+INSERTING AT: 17:10
+PAUSES AT: 18:4
+ 14
+ 15 if (0)
+ 16 a();
+ -> 17 else if (0#)
+ => 18 |a();
+ 19 else
+ 20 a();
+ 21
+
+INSERTING AT: 18:5
+PAUSES AT: 20:4
+ 15 if (0)
+ 16 a();
+ 17 else if (0)
+ -> 18 a#();
+ 19 else
+ => 20 |a();
+ 21
+ 22 a() ? b() : c()
+ 23
+
+INSERTING AT: 20:5
+PAUSES AT: 22:0
+ 17 else if (0)
+ 18 a();
+ 19 else
+ -> 20 a#();
+ 21
+ => 22 |a() ? b() : c()
+ 23
+ 24 // Loops
+ 25
+
+INSERTING AT: 22:1
+PAUSES AT: 26:7
+ 19 else
+ 20 a();
+ 21
+ -> 22 a#() ? b() : c()
+ 23
+ 24 // Loops
+ 25
+ => 26 while (|0)
+ 27 a();
+ 28
+ 29 while (0) {
+
+INSERTING AT: 26:8
+PAUSES AT: 27:4
+ 23
+ 24 // Loops
+ 25
+ -> 26 while (0#)
+ => 27 |a();
+ 28
+ 29 while (0) {
+ 30 a();
+
+INSERTING AT: 27:5
+PAUSES AT: 29:7
+ 24 // Loops
+ 25
+ 26 while (0)
+ -> 27 a#();
+ 28
+ => 29 while (|0) {
+ 30 a();
+ 31 }
+ 32
+
+INSERTING AT: 29:8
+PAUSES AT: 30:4
+ 26 while (0)
+ 27 a();
+ 28
+ -> 29 while (0#) {
+ => 30 |a();
+ 31 }
+ 32
+ 33 do {
+
+INSERTING AT: 30:5
+PAUSES AT: 34:4
+ 27 a();
+ 28
+ 29 while (0) {
+ -> 30 a#();
+ 31 }
+ 32
+ 33 do {
+ => 34 |a();
+ 35 } while (0);
+ 36
+ 37 for (a(); b(); c())
+
+INSERTING AT: 34:5
+PAUSES AT: 35:9
+ 31 }
+ 32
+ 33 do {
+ -> 34 a#();
+ => 35 } while (|0);
+ 36
+ 37 for (a(); b(); c())
+ 38 break;
+
+INSERTING AT: 35:10
+PAUSES AT: 37:5
+ 32
+ 33 do {
+ 34 a();
+ -> 35 } while (0#);
+ 36
+ => 37 for (|a(); b(); c())
+ 38 break;
+ 39
+ 40 for (; b(); c())
+
+INSERTING AT: 37:6
+PAUSES AT: 37:10
+ 34 a();
+ 35 } while (0);
+ 36
+-=> 37 for (a#(); |b(); c())
+ 38 break;
+ 39
+ 40 for (; b(); c())
+
+INSERTING AT: 37:11
+PAUSES AT: 37:15
+ 34 a();
+ 35 } while (0);
+ 36
+-=> 37 for (a(); b#(); |c())
+ 38 break;
+ 39
+ 40 for (; b(); c())
+
+INSERTING AT: 37:16
+PAUSES AT: 38:4
+ 34 a();
+ 35 } while (0);
+ 36
+ -> 37 for (a(); b(); c#())
+ => 38 |break;
+ 39
+ 40 for (; b(); c())
+ 41 break;
+
+INSERTING AT: 38:5
+PAUSES AT: 40:7
+ 35 } while (0);
+ 36
+ 37 for (a(); b(); c())
+ -> 38 b#reak;
+ 39
+ => 40 for (; |b(); c())
+ 41 break;
+ 42
+ 43 for (a(); b();)
+
+INSERTING AT: 40:8
+PAUSES AT: 40:12
+ 37 for (a(); b(); c())
+ 38 break;
+ 39
+-=> 40 for (; b#(); |c())
+ 41 break;
+ 42
+ 43 for (a(); b();)
+
+INSERTING AT: 40:13
+PAUSES AT: 41:4
+ 37 for (a(); b(); c())
+ 38 break;
+ 39
+ -> 40 for (; b(); c#())
+ => 41 |break;
+ 42
+ 43 for (a(); b();)
+ 44 break;
+
+INSERTING AT: 41:5
+PAUSES AT: 43:5
+ 38 break;
+ 39
+ 40 for (; b(); c())
+ -> 41 b#reak;
+ 42
+ => 43 for (|a(); b();)
+ 44 break;
+ 45
+ 46 for (a();; c())
+
+INSERTING AT: 43:6
+PAUSES AT: 43:10
+ 40 for (; b(); c())
+ 41 break;
+ 42
+-=> 43 for (a#(); |b();)
+ 44 break;
+ 45
+ 46 for (a();; c())
+
+INSERTING AT: 43:11
+PAUSES AT: 44:4
+ 40 for (; b(); c())
+ 41 break;
+ 42
+ -> 43 for (a(); b#();)
+ => 44 |break;
+ 45
+ 46 for (a();; c())
+ 47 break;
+
+INSERTING AT: 44:5
+PAUSES AT: 46:5
+ 41 break;
+ 42
+ 43 for (a(); b();)
+ -> 44 b#reak;
+ 45
+ => 46 for (|a();; c())
+ 47 break;
+ 48
+ 49 for (a();;)
+
+INSERTING AT: 46:6
+PAUSES AT: 46:11
+ 43 for (a(); b();)
+ 44 break;
+ 45
+-=> 46 for (a#();; |c())
+ 47 break;
+ 48
+ 49 for (a();;)
+
+INSERTING AT: 46:12
+PAUSES AT: 47:4
+ 43 for (a(); b();)
+ 44 break;
+ 45
+ -> 46 for (a();; c#())
+ => 47 |break;
+ 48
+ 49 for (a();;)
+ 50 break;
+
+INSERTING AT: 47:5
+PAUSES AT: 49:5
+ 44 break;
+ 45
+ 46 for (a();; c())
+ -> 47 b#reak;
+ 48
+ => 49 for (|a();;)
+ 50 break;
+ 51
+ 52 for (; b();)
+
+INSERTING AT: 49:6
+PAUSES AT: 50:4
+ 46 for (a();; c())
+ 47 break;
+ 48
+ -> 49 for (a#();;)
+ => 50 |break;
+ 51
+ 52 for (; b();)
+ 53 break;
+
+INSERTING AT: 50:5
+PAUSES AT: 52:7
+ 47 break;
+ 48
+ 49 for (a();;)
+ -> 50 b#reak;
+ 51
+ => 52 for (; |b();)
+ 53 break;
+ 54
+ 55 for (;; c())
+
+INSERTING AT: 52:8
+PAUSES AT: 53:4
+ 49 for (a();;)
+ 50 break;
+ 51
+ -> 52 for (; b#();)
+ => 53 |break;
+ 54
+ 55 for (;; c())
+ 56 break;
+
+INSERTING AT: 53:5
+PAUSES AT: 55:8
+ 50 break;
+ 51
+ 52 for (; b();)
+ -> 53 b#reak;
+ 54
+ => 55 for (;; |c())
+ 56 break;
+ 57
+ 58 for (;;)
+
+INSERTING AT: 55:9
+PAUSES AT: 56:4
+ 52 for (; b();)
+ 53 break;
+ 54
+ -> 55 for (;; c#())
+ => 56 |break;
+ 57
+ 58 for (;;)
+ 59 break;
+
+INSERTING AT: 56:5
+PAUSES AT: 59:4
+ 53 break;
+ 54
+ 55 for (;; c())
+ -> 56 b#reak;
+ 57
+ 58 for (;;)
+ => 59 |break;
+ 60
+ 61 for (a(); b(); c()) {
+ 62 break;
+
+INSERTING AT: 59:5
+PAUSES AT: 61:5
+ 56 break;
+ 57
+ 58 for (;;)
+ -> 59 b#reak;
+ 60
+ => 61 for (|a(); b(); c()) {
+ 62 break;
+ 63 }
+ 64
+
+INSERTING AT: 61:6
+PAUSES AT: 61:10
+ 58 for (;;)
+ 59 break;
+ 60
+-=> 61 for (a#(); |b(); c()) {
+ 62 break;
+ 63 }
+ 64
+
+INSERTING AT: 61:11
+PAUSES AT: 61:15
+ 58 for (;;)
+ 59 break;
+ 60
+-=> 61 for (a(); b#(); |c()) {
+ 62 break;
+ 63 }
+ 64
+
+INSERTING AT: 61:16
+PAUSES AT: 62:4
+ 58 for (;;)
+ 59 break;
+ 60
+ -> 61 for (a(); b(); c#()) {
+ => 62 |break;
+ 63 }
+ 64
+ 65 for (let x of arr)
+
+INSERTING AT: 62:5
+PAUSES AT: 65:14
+ 59 break;
+ 60
+ 61 for (a(); b(); c()) {
+ -> 62 b#reak;
+ 63 }
+ 64
+ => 65 for (let x of |arr)
+ 66 break;
+ 67
+ 68 for (let x in obj)
+
+INSERTING AT: 65:15
+PAUSES AT: 66:4
+ 62 break;
+ 63 }
+ 64
+ -> 65 for (let x of a#rr)
+ => 66 |break;
+ 67
+ 68 for (let x in obj)
+ 69 break;
+
+INSERTING AT: 66:5
+PAUSES AT: 68:14
+ 63 }
+ 64
+ 65 for (let x of arr)
+ -> 66 b#reak;
+ 67
+ => 68 for (let x in |obj)
+ 69 break;
+ 70
+ 71 // Switch
+
+INSERTING AT: 68:15
+PAUSES AT: 69:4
+ 65 for (let x of arr)
+ 66 break;
+ 67
+ -> 68 for (let x in o#bj)
+ => 69 |break;
+ 70
+ 71 // Switch
+ 72
+
+INSERTING AT: 69:5
+PAUSES AT: 73:8
+ 66 break;
+ 67
+ 68 for (let x in obj)
+ -> 69 b#reak;
+ 70
+ 71 // Switch
+ 72
+ => 73 switch (|0) {
+ 74 case 1:
+ 75 a();
+ 76 break;
+
+INSERTING AT: 73:9
+PAUSES AT: 75:4
+ 70
+ 71 // Switch
+ 72
+ -> 73 switch (0#) {
+ 74 case 1:
+ => 75 |a();
+ 76 break;
+ 77 case 2:
+ 78 a();
+
+INSERTING AT: 75:5
+PAUSES AT: 76:4
+ 72
+ 73 switch (0) {
+ 74 case 1:
+ -> 75 a#();
+ => 76 |break;
+ 77 case 2:
+ 78 a();
+ 79 // fallthrough
+
+INSERTING AT: 76:5
+PAUSES AT: 78:4
+ 73 switch (0) {
+ 74 case 1:
+ 75 a();
+ -> 76 b#reak;
+ 77 case 2:
+ => 78 |a();
+ 79 // fallthrough
+ 80 case 3:
+ 81 a();
+
+INSERTING AT: 78:5
+PAUSES AT: 81:4
+ 75 a();
+ 76 break;
+ 77 case 2:
+ -> 78 a#();
+ 79 // fallthrough
+ 80 case 3:
+ => 81 |a();
+ 82 break;
+ 83 default:
+ 84 a();
+
+INSERTING AT: 81:5
+PAUSES AT: 82:4
+ 78 a();
+ 79 // fallthrough
+ 80 case 3:
+ -> 81 a#();
+ => 82 |break;
+ 83 default:
+ 84 a();
+ 85 break;
+
+INSERTING AT: 82:5
+PAUSES AT: 84:4
+ 79 // fallthrough
+ 80 case 3:
+ 81 a();
+ -> 82 b#reak;
+ 83 default:
+ => 84 |a();
+ 85 break;
+ 86 }
+ 87
+
+INSERTING AT: 84:5
+PAUSES AT: 85:4
+ 81 a();
+ 82 break;
+ 83 default:
+ -> 84 a#();
+ => 85 |break;
+ 86 }
+ 87
+ 88 // Try/Catch
+
+INSERTING AT: 85:5
+PAUSES AT: 91:4
+ 82 break;
+ 83 default:
+ 84 a();
+ -> 85 b#reak;
+ 86 }
+ 87
+ 88 // Try/Catch
+ 89
+ 90 try {
+ => 91 |a();
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ 94 } finally {
+
+INSERTING AT: 91:5
+PAUSES AT: 93:4
+ 88 // Try/Catch
+ 89
+ 90 try {
+ -> 91 a#();
+ 92 } catch (e) {
+ => 93 |shouldNotBeReached();
+ 94 } finally {
+ 95 b();
+ 96 }
+
+INSERTING AT: 93:5
+PAUSES AT: 95:4
+ 90 try {
+ 91 a();
+ 92 } catch (e) {
+ -> 93 s#houldNotBeReached();
+ 94 } finally {
+ => 95 |b();
+ 96 }
+ 97
+ 98 // Class
+
+INSERTING AT: 95:5
+PAUSES AT: 151:8
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ 94 } finally {
+ -> 95 b#();
+ 96 }
+ 97
+ 98 // Class
+ 99
+ 100 class Base {
+ 101 constructor()
+ 102 {
+ 103 this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+ 107 {
+ 108 a();
+ 109 }
+ 110
+ 111 method()
+ 112 {
+ 113 a();
+ 114 }
+ 115 }
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+INSERTING AT: 101:0
+PAUSES AT: 103:8
+ 98 // Class
+ 99
+ 100 class Base {
+ -> 101 # constructor()
+ 102 {
+ => 103 |this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+
+INSERTING AT: 103:9
+PAUSES AT: 104:4
+ 100 class Base {
+ 101 constructor()
+ 102 {
+ -> 103 t#his._base = true;
+ => 104 |}
+ 105
+ 106 baseMethod()
+ 107 {
+
+INSERTING AT: 106:0
+PAUSES AT: 108:8
+ 103 this._base = true;
+ 104 }
+ 105
+ -> 106 # baseMethod()
+ 107 {
+ => 108 |a();
+ 109 }
+ 110
+ 111 method()
+
+INSERTING AT: 108:9
+PAUSES AT: 109:4
+ 105
+ 106 baseMethod()
+ 107 {
+ -> 108 a#();
+ => 109 |}
+ 110
+ 111 method()
+ 112 {
+
+INSERTING AT: 111:0
+PAUSES AT: 113:8
+ 108 a();
+ 109 }
+ 110
+ -> 111 # method()
+ 112 {
+ => 113 |a();
+ 114 }
+ 115 }
+ 116
+
+INSERTING AT: 113:9
+PAUSES AT: 114:4
+ 110
+ 111 method()
+ 112 {
+ -> 113 a#();
+ => 114 |}
+ 115 }
+ 116
+ 117 class Child extends Base {
+
+INSERTING AT: 118:0
+PAUSES AT: 120:8
+ 115 }
+ 116
+ 117 class Child extends Base {
+ -> 118 # constructor()
+ 119 {
+ => 120 |super();
+ 121 this._child = true;
+ 122 }
+ 123
+
+INSERTING AT: 120:9
+PAUSES AT: 121:8
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ -> 120 s#uper();
+ => 121 |this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+
+INSERTING AT: 121:9
+PAUSES AT: 122:4
+ 118 constructor()
+ 119 {
+ 120 super();
+ -> 121 t#his._child = true;
+ => 122 |}
+ 123
+ 124 childMethod()
+ 125 {
+
+INSERTING AT: 124:0
+PAUSES AT: 126:8
+ 121 this._child = true;
+ 122 }
+ 123
+ -> 124 # childMethod()
+ 125 {
+ => 126 |b();
+ 127 }
+ 128
+ 129 method()
+
+INSERTING AT: 126:9
+PAUSES AT: 127:4
+ 123
+ 124 childMethod()
+ 125 {
+ -> 126 b#();
+ => 127 |}
+ 128
+ 129 method()
+ 130 {
+
+INSERTING AT: 129:0
+PAUSES AT: 131:8
+ 126 b();
+ 127 }
+ 128
+ -> 129 # method()
+ 130 {
+ => 131 |super.method();
+ 132 b();
+ 133 }
+ 134
+
+INSERTING AT: 131:9
+PAUSES AT: 132:8
+ 128
+ 129 method()
+ 130 {
+ -> 131 s#uper.method();
+ => 132 |b();
+ 133 }
+ 134
+ 135 get name()
+
+INSERTING AT: 132:9
+PAUSES AT: 133:4
+ 129 method()
+ 130 {
+ 131 super.method();
+ -> 132 b#();
+ => 133 |}
+ 134
+ 135 get name()
+ 136 {
+
+INSERTING AT: 135:0
+PAUSES AT: 137:8
+ 132 b();
+ 133 }
+ 134
+ -> 135 # get name()
+ 136 {
+ => 137 |return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+
+INSERTING AT: 137:9
+PAUSES AT: 138:4
+ 134
+ 135 get name()
+ 136 {
+ -> 137 r#eturn this._name;
+ => 138 |}
+ 139
+ 140 set name(x)
+ 141 {
+
+INSERTING AT: 140:0
+PAUSES AT: 142:8
+ 137 return this._name;
+ 138 }
+ 139
+ -> 140 # set name(x)
+ 141 {
+ => 142 |this._name = x;
+ 143 }
+ 144 }
+ 145
+
+INSERTING AT: 142:9
+PAUSES AT: 143:4
+ 139
+ 140 set name(x)
+ 141 {
+ -> 142 t#his._name = x;
+ => 143 |}
+ 144 }
+ 145
+ 146 // ---------
+
+INSERTING AT: 151:9
+PAUSES AT: 156:8
+ 148 // ---------
+ 149
+ 150 {
+ -> 151 a#();
+ 152 }
+ 153
+ 154 label:
+ 155 {
+ => 156 |a();
+ 157 }
+ 158
+ 159 var w1 = {x:1, y:2};
+
+INSERTING AT: 156:9
+PAUSES AT: 159:0
+ 153
+ 154 label:
+ 155 {
+ -> 156 a#();
+ 157 }
+ 158
+ => 159 |var w1 = {x:1, y:2};
+ 160 with (w1) {
+ 161 a();
+ 162 }
+
+INSERTING AT: 159:1
+PAUSES AT: 160:6
+ 156 a();
+ 157 }
+ 158
+ -> 159 v#ar w1 = {x:1, y:2};
+ => 160 with (|w1) {
+ 161 a();
+ 162 }
+ 163
+
+INSERTING AT: 160:7
+PAUSES AT: 161:4
+ 157 }
+ 158
+ 159 var w1 = {x:1, y:2};
+ -> 160 with (w#1) {
+ => 161 |a();
+ 162 }
+ 163
+ 164 var v1 = 1,
+
+INSERTING AT: 161:5
+PAUSES AT: 164:0
+ 158
+ 159 var w1 = {x:1, y:2};
+ 160 with (w1) {
+ -> 161 a#();
+ 162 }
+ 163
+ => 164 |var v1 = 1,
+ 165 v2 = 1;
+ 166 let l1 = 2,
+ 167 l2 = 2;
+
+INSERTING AT: 164:1
+PAUSES AT: 166:0
+ 161 a();
+ 162 }
+ 163
+ -> 164 v#ar v1 = 1,
+ 165 v2 = 1;
+ => 166 |let l1 = 2,
+ 167 l2 = 2;
+ 168 const c1 = 3,
+ 169 c2 = 3;
+
+INSERTING AT: 166:1
+PAUSES AT: 168:0
+ 163
+ 164 var v1 = 1,
+ 165 v2 = 1;
+ -> 166 l#et l1 = 2,
+ 167 l2 = 2;
+ => 168 |const c1 = 3,
+ 169 c2 = 3;
+ 170
+ 171 v1 = v2 = v1;
+
+INSERTING AT: 168:1
+PAUSES AT: 171:0
+ 165 v2 = 1;
+ 166 let l1 = 2,
+ 167 l2 = 2;
+ -> 168 c#onst c1 = 3,
+ 169 c2 = 3;
+ 170
+ => 171 |v1 = v2 = v1;
+ 172
+ 173 var {x, y} = obj;
+ 174 var [w, z] = arr;
+
+INSERTING AT: 171:1
+PAUSES AT: 173:0
+ 168 const c1 = 3,
+ 169 c2 = 3;
+ 170
+ -> 171 v#1 = v2 = v1;
+ 172
+ => 173 |var {x, y} = obj;
+ 174 var [w, z] = arr;
+ 175
+ 176 var o1 = {
+
+INSERTING AT: 173:1
+PAUSES AT: 174:0
+ 170
+ 171 v1 = v2 = v1;
+ 172
+ -> 173 v#ar {x, y} = obj;
+ => 174 |var [w, z] = arr;
+ 175
+ 176 var o1 = {
+ 177 p1: 1,
+
+INSERTING AT: 174:1
+PAUSES AT: 176:0
+ 171 v1 = v2 = v1;
+ 172
+ 173 var {x, y} = obj;
+ -> 174 v#ar [w, z] = arr;
+ 175
+ => 176 |var o1 = {
+ 177 p1: 1,
+ 178 p2: a(),
+ 179 p3: 1,
+
+INSERTING AT: 176:1
+PAUSES AT: 184:0
+ 173 var {x, y} = obj;
+ 174 var [w, z] = arr;
+ 175
+ -> 176 v#ar o1 = {
+ 177 p1: 1,
+ 178 p2: a(),
+ 179 p3: 1,
+ 180 ["p4"]: 1,
+ 181 [b()]: 1,
+ 182 };
+ 183
+ => 184 |var a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+
+INSERTING AT: 184:1
+PAUSES AT: 191:0
+ 181 [b()]: 1,
+ 182 };
+ 183
+ -> 184 v#ar a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+ 188 b(),
+ 189 ];
+ 190
+ => 191 |var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+
+INSERTING AT: 191:1
+PAUSES AT: 192:0
+ 188 b(),
+ 189 ];
+ 190
+ -> 191 v#ar i1 = new Base;
+ => 192 |var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+ 195 i2.method();
+
+INSERTING AT: 192:1
+PAUSES AT: 193:0
+ 189 ];
+ 190
+ 191 var i1 = new Base;
+ -> 192 v#ar i2 = new Child;
+ => 193 |i2.name;
+ 194 i2.name = 1;
+ 195 i2.method();
+ 196
+
+INSERTING AT: 193:1
+PAUSES AT: 194:0
+ 190
+ 191 var i1 = new Base;
+ 192 var i2 = new Child;
+ -> 193 i#2.name;
+ => 194 |i2.name = 1;
+ 195 i2.method();
+ 196
+ 197 var t1 = `${1} ${x=1} ${a()}`;
+
+INSERTING AT: 194:1
+PAUSES AT: 195:0
+ 191 var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+ -> 194 i#2.name = 1;
+ => 195 |i2.method();
+ 196
+ 197 var t1 = `${1} ${x=1} ${a()}`;
+ 198 var t2 = a`${1} ${x=1} ${a()}`;
+
+INSERTING AT: 195:1
+PAUSES AT: 197:0
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+ -> 195 i#2.method();
+ 196
+ => 197 |var t1 = `${1} ${x=1} ${a()}`;
+ 198 var t2 = a`${1} ${x=1} ${a()}`;
+ 199
+ 200 a(a(), b());
+
+INSERTING AT: 197:1
+PAUSES AT: 198:0
+ 194 i2.name = 1;
+ 195 i2.method();
+ 196
+ -> 197 v#ar t1 = `${1} ${x=1} ${a()}`;
+ => 198 |var t2 = a`${1} ${x=1} ${a()}`;
+ 199
+ 200 a(a(), b());
+ 201
+
+INSERTING AT: 198:1
+PAUSES AT: 200:0
+ 195 i2.method();
+ 196
+ 197 var t1 = `${1} ${x=1} ${a()}`;
+ -> 198 v#ar t2 = a`${1} ${x=1} ${a()}`;
+ 199
+ => 200 |a(a(), b());
+ 201
+
+
+-- Running test case: Debugger.resolvedBreakpoint.dumpAllLocations.Functions
+
+INSERTING AT: 0:0
+PAUSES AT: 0:19
+-=> 0 #function inline() {|}
+ 1 function named() {
+ 2 var x;
+ 3 }
+
+INSERTING AT: 0:20
+PAUSES AT: 44:0
+ -> 0 function inline() {}#
+ 1 function named() {
+ 2 var x;
+ 3 }
+ 4 function outer1() {
+ 5 function inner() {
+ 6 var y;
+ 7 }
+ 8 }
+ 9 function outer2()
+ 10 {
+ 11 function inner()
+ 12 {
+ 13 var y;
+ 14 }
+ 15 }
+ 16 function outer3() {
+ 17 var x;
+ 18 function inner() { var y; }
+ 19 }
+ 20 function outer4() {
+ 21 function inner() { var y; }
+ 22 var x;
+ 23 }
+ 24 function outer5() {
+ 25 var x;
+ 26 function inner() { var y; }
+ 27 var x;
+ 28 }
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+ 31 var x;
+ 32 function inner2() { var z; }
+ 33 }
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+ 36 function inner2() { var z; }
+ 37 var x;
+ 38 }
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+ 41 function inner2() { var z; }
+ 42 }
+ 43
+ => 44 |(function() {
+ 45 var x;
+ 46 })();
+ 47
+
+INSERTING AT: 1:0
+PAUSES AT: 2:4
+ 0 function inline() {}
+ -> 1 #function named() {
+ => 2 |var x;
+ 3 }
+ 4 function outer1() {
+ 5 function inner() {
+
+INSERTING AT: 2:5
+PAUSES AT: 3:0
+ 0 function inline() {}
+ 1 function named() {
+ -> 2 v#ar x;
+ => 3 |}
+ 4 function outer1() {
+ 5 function inner() {
+ 6 var y;
+
+INSERTING AT: 4:0
+PAUSES AT: 8:0
+ 1 function named() {
+ 2 var x;
+ 3 }
+ -> 4 #function outer1() {
+ 5 function inner() {
+ 6 var y;
+ 7 }
+ => 8 |}
+ 9 function outer2()
+ 10 {
+ 11 function inner()
+
+INSERTING AT: 4:15
+PAUSES AT: 6:8
+ 1 function named() {
+ 2 var x;
+ 3 }
+ -> 4 function outer1#() {
+ 5 function inner() {
+ => 6 |var y;
+ 7 }
+ 8 }
+ 9 function outer2()
+
+INSERTING AT: 6:9
+PAUSES AT: 7:4
+ 3 }
+ 4 function outer1() {
+ 5 function inner() {
+ -> 6 v#ar y;
+ => 7 |}
+ 8 }
+ 9 function outer2()
+ 10 {
+
+INSERTING AT: 9:0
+PAUSES AT: 15:0
+ 6 var y;
+ 7 }
+ 8 }
+ -> 9 #function outer2()
+ 10 {
+ 11 function inner()
+ 12 {
+ 13 var y;
+ 14 }
+ => 15 |}
+ 16 function outer3() {
+ 17 var x;
+ 18 function inner() { var y; }
+
+INSERTING AT: 9:15
+PAUSES AT: 13:8
+ 6 var y;
+ 7 }
+ 8 }
+ -> 9 function outer2#()
+ 10 {
+ 11 function inner()
+ 12 {
+ => 13 |var y;
+ 14 }
+ 15 }
+ 16 function outer3() {
+
+INSERTING AT: 13:9
+PAUSES AT: 14:4
+ 10 {
+ 11 function inner()
+ 12 {
+ -> 13 v#ar y;
+ => 14 |}
+ 15 }
+ 16 function outer3() {
+ 17 var x;
+
+INSERTING AT: 16:0
+PAUSES AT: 17:4
+ 13 var y;
+ 14 }
+ 15 }
+ -> 16 #function outer3() {
+ => 17 |var x;
+ 18 function inner() { var y; }
+ 19 }
+ 20 function outer4() {
+
+INSERTING AT: 17:5
+PAUSES AT: 19:0
+ 14 }
+ 15 }
+ 16 function outer3() {
+ -> 17 v#ar x;
+ 18 function inner() { var y; }
+ => 19 |}
+ 20 function outer4() {
+ 21 function inner() { var y; }
+ 22 var x;
+
+INSERTING AT: 18:0
+PAUSES AT: 18:23
+ 15 }
+ 16 function outer3() {
+ 17 var x;
+-=> 18 # function inner() { |var y; }
+ 19 }
+ 20 function outer4() {
+ 21 function inner() { var y; }
+
+INSERTING AT: 18:24
+PAUSES AT: 18:30
+ 15 }
+ 16 function outer3() {
+ 17 var x;
+-=> 18 function inner() { v#ar y; |}
+ 19 }
+ 20 function outer4() {
+ 21 function inner() { var y; }
+
+INSERTING AT: 20:0
+PAUSES AT: 22:4
+ 17 var x;
+ 18 function inner() { var y; }
+ 19 }
+ -> 20 #function outer4() {
+ 21 function inner() { var y; }
+ => 22 |var x;
+ 23 }
+ 24 function outer5() {
+ 25 var x;
+
+INSERTING AT: 20:15
+PAUSES AT: 21:23
+ 17 var x;
+ 18 function inner() { var y; }
+ 19 }
+ -> 20 function outer4#() {
+ => 21 function inner() { |var y; }
+ 22 var x;
+ 23 }
+ 24 function outer5() {
+
+INSERTING AT: 21:24
+PAUSES AT: 21:30
+ 18 function inner() { var y; }
+ 19 }
+ 20 function outer4() {
+-=> 21 function inner() { v#ar y; |}
+ 22 var x;
+ 23 }
+ 24 function outer5() {
+
+INSERTING AT: 22:5
+PAUSES AT: 23:0
+ 19 }
+ 20 function outer4() {
+ 21 function inner() { var y; }
+ -> 22 v#ar x;
+ => 23 |}
+ 24 function outer5() {
+ 25 var x;
+ 26 function inner() { var y; }
+
+INSERTING AT: 24:0
+PAUSES AT: 25:4
+ 21 function inner() { var y; }
+ 22 var x;
+ 23 }
+ -> 24 #function outer5() {
+ => 25 |var x;
+ 26 function inner() { var y; }
+ 27 var x;
+ 28 }
+
+INSERTING AT: 25:5
+PAUSES AT: 27:4
+ 22 var x;
+ 23 }
+ 24 function outer5() {
+ -> 25 v#ar x;
+ 26 function inner() { var y; }
+ => 27 |var x;
+ 28 }
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+
+INSERTING AT: 26:0
+PAUSES AT: 26:23
+ 23 }
+ 24 function outer5() {
+ 25 var x;
+-=> 26 # function inner() { |var y; }
+ 27 var x;
+ 28 }
+ 29 function outer6() {
+
+INSERTING AT: 26:24
+PAUSES AT: 26:30
+ 23 }
+ 24 function outer5() {
+ 25 var x;
+-=> 26 function inner() { v#ar y; |}
+ 27 var x;
+ 28 }
+ 29 function outer6() {
+
+INSERTING AT: 27:5
+PAUSES AT: 28:0
+ 24 function outer5() {
+ 25 var x;
+ 26 function inner() { var y; }
+ -> 27 v#ar x;
+ => 28 |}
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+ 31 var x;
+
+INSERTING AT: 29:0
+PAUSES AT: 31:4
+ 26 function inner() { var y; }
+ 27 var x;
+ 28 }
+ -> 29 #function outer6() {
+ 30 function inner1() { var y; }
+ => 31 |var x;
+ 32 function inner2() { var z; }
+ 33 }
+ 34 function outer7() {
+
+INSERTING AT: 29:15
+PAUSES AT: 30:24
+ 26 function inner() { var y; }
+ 27 var x;
+ 28 }
+ -> 29 function outer6#() {
+ => 30 function inner1() { |var y; }
+ 31 var x;
+ 32 function inner2() { var z; }
+ 33 }
+
+INSERTING AT: 30:25
+PAUSES AT: 30:31
+ 27 var x;
+ 28 }
+ 29 function outer6() {
+-=> 30 function inner1() { v#ar y; |}
+ 31 var x;
+ 32 function inner2() { var z; }
+ 33 }
+
+INSERTING AT: 31:5
+PAUSES AT: 33:0
+ 28 }
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+ -> 31 v#ar x;
+ 32 function inner2() { var z; }
+ => 33 |}
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+ 36 function inner2() { var z; }
+
+INSERTING AT: 32:0
+PAUSES AT: 32:24
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+ 31 var x;
+-=> 32 # function inner2() { |var z; }
+ 33 }
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+
+INSERTING AT: 32:25
+PAUSES AT: 32:31
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+ 31 var x;
+-=> 32 function inner2() { v#ar z; |}
+ 33 }
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+
+INSERTING AT: 34:0
+PAUSES AT: 37:4
+ 31 var x;
+ 32 function inner2() { var z; }
+ 33 }
+ -> 34 #function outer7() {
+ 35 function inner1() { var y; }
+ 36 function inner2() { var z; }
+ => 37 |var x;
+ 38 }
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+
+INSERTING AT: 34:15
+PAUSES AT: 35:24
+ 31 var x;
+ 32 function inner2() { var z; }
+ 33 }
+ -> 34 function outer7#() {
+ => 35 function inner1() { |var y; }
+ 36 function inner2() { var z; }
+ 37 var x;
+ 38 }
+
+INSERTING AT: 35:25
+PAUSES AT: 35:31
+ 32 function inner2() { var z; }
+ 33 }
+ 34 function outer7() {
+-=> 35 function inner1() { v#ar y; |}
+ 36 function inner2() { var z; }
+ 37 var x;
+ 38 }
+
+INSERTING AT: 36:0
+PAUSES AT: 36:24
+ 33 }
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+-=> 36 # function inner2() { |var z; }
+ 37 var x;
+ 38 }
+ 39 function outer7() {
+
+INSERTING AT: 36:25
+PAUSES AT: 36:31
+ 33 }
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+-=> 36 function inner2() { v#ar z; |}
+ 37 var x;
+ 38 }
+ 39 function outer7() {
+
+INSERTING AT: 37:5
+PAUSES AT: 38:0
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+ 36 function inner2() { var z; }
+ -> 37 v#ar x;
+ => 38 |}
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+ 41 function inner2() { var z; }
+
+INSERTING AT: 39:0
+PAUSES AT: 42:0
+ 36 function inner2() { var z; }
+ 37 var x;
+ 38 }
+ -> 39 #function outer7() {
+ 40 function inner1() { var y; }
+ 41 function inner2() { var z; }
+ => 42 |}
+ 43
+ 44 (function() {
+ 45 var x;
+
+INSERTING AT: 39:15
+PAUSES AT: 40:24
+ 36 function inner2() { var z; }
+ 37 var x;
+ 38 }
+ -> 39 function outer7#() {
+ => 40 function inner1() { |var y; }
+ 41 function inner2() { var z; }
+ 42 }
+ 43
+
+INSERTING AT: 40:25
+PAUSES AT: 40:31
+ 37 var x;
+ 38 }
+ 39 function outer7() {
+-=> 40 function inner1() { v#ar y; |}
+ 41 function inner2() { var z; }
+ 42 }
+ 43
+
+INSERTING AT: 41:0
+PAUSES AT: 41:24
+ 38 }
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+-=> 41 # function inner2() { |var z; }
+ 42 }
+ 43
+ 44 (function() {
+
+INSERTING AT: 41:25
+PAUSES AT: 41:31
+ 38 }
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+-=> 41 function inner2() { v#ar z; |}
+ 42 }
+ 43
+ 44 (function() {
+
+INSERTING AT: 44:1
+PAUSES AT: 45:4
+ 41 function inner2() { var z; }
+ 42 }
+ 43
+ -> 44 (#function() {
+ => 45 |var x;
+ 46 })();
+ 47
+ 48 (() => {
+
+INSERTING AT: 45:5
+PAUSES AT: 46:0
+ 42 }
+ 43
+ 44 (function() {
+ -> 45 v#ar x;
+ => 46 |})();
+ 47
+ 48 (() => {
+ 49 var x;
+
+INSERTING AT: 46:1
+PAUSES AT: 48:0
+ 43
+ 44 (function() {
+ 45 var x;
+ -> 46 }#)();
+ 47
+ => 48 |(() => {
+ 49 var x;
+ 50 });
+ 51
+
+INSERTING AT: 48:1
+PAUSES AT: 49:4
+ 45 var x;
+ 46 })();
+ 47
+ -> 48 (#() => {
+ => 49 |var x;
+ 50 });
+ 51
+ 52 function* generator() {
+
+INSERTING AT: 49:5
+PAUSES AT: 50:0
+ 46 })();
+ 47
+ 48 (() => {
+ -> 49 v#ar x;
+ => 50 |});
+ 51
+ 52 function* generator() {
+ 53 var x;
+
+INSERTING AT: 50:1
+PAUSES AT: 87:0
+ 47
+ 48 (() => {
+ 49 var x;
+ -> 50 }#);
+ 51
+ 52 function* generator() {
+ 53 var x;
+ 54 }
+ 55
+ 56 class Class {
+ 57 static staticMethod1() {
+ 58 var x;
+ 59 }
+ 60 static staticMethod2()
+ 61 {
+ 62 var x;
+ 63 }
+ 64 method1() {
+ 65 var x;
+ 66 }
+ 67 method2()
+ 68 {
+ 69 var x;
+ 70 }
+ 71 get getter1() {
+ 72 var x;
+ 73 }
+ 74 get getter2()
+ 75 {
+ 76 var x;
+ 77 }
+ 78 set setter1(x) {
+ 79 var s;
+ 80 }
+ 81 set setter2(x)
+ 82 {
+ 83 var s;
+ 84 }
+ 85 }
+ 86
+ => 87 |x => x;
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+
+INSERTING AT: 52:0
+PAUSES AT: 53:4
+ 49 var x;
+ 50 });
+ 51
+ -> 52 #function* generator() {
+ => 53 |var x;
+ 54 }
+ 55
+ 56 class Class {
+
+INSERTING AT: 53:5
+PAUSES AT: 54:0
+ 50 });
+ 51
+ 52 function* generator() {
+ -> 53 v#ar x;
+ => 54 |}
+ 55
+ 56 class Class {
+ 57 static staticMethod1() {
+
+INSERTING AT: 57:0
+PAUSES AT: 58:8
+ 54 }
+ 55
+ 56 class Class {
+ -> 57 # static staticMethod1() {
+ => 58 |var x;
+ 59 }
+ 60 static staticMethod2()
+ 61 {
+
+INSERTING AT: 58:9
+PAUSES AT: 59:4
+ 55
+ 56 class Class {
+ 57 static staticMethod1() {
+ -> 58 v#ar x;
+ => 59 |}
+ 60 static staticMethod2()
+ 61 {
+ 62 var x;
+
+INSERTING AT: 60:0
+PAUSES AT: 62:8
+ 57 static staticMethod1() {
+ 58 var x;
+ 59 }
+ -> 60 # static staticMethod2()
+ 61 {
+ => 62 |var x;
+ 63 }
+ 64 method1() {
+ 65 var x;
+
+INSERTING AT: 62:9
+PAUSES AT: 63:4
+ 59 }
+ 60 static staticMethod2()
+ 61 {
+ -> 62 v#ar x;
+ => 63 |}
+ 64 method1() {
+ 65 var x;
+ 66 }
+
+INSERTING AT: 64:0
+PAUSES AT: 65:8
+ 61 {
+ 62 var x;
+ 63 }
+ -> 64 # method1() {
+ => 65 |var x;
+ 66 }
+ 67 method2()
+ 68 {
+
+INSERTING AT: 65:9
+PAUSES AT: 66:4
+ 62 var x;
+ 63 }
+ 64 method1() {
+ -> 65 v#ar x;
+ => 66 |}
+ 67 method2()
+ 68 {
+ 69 var x;
+
+INSERTING AT: 67:0
+PAUSES AT: 69:8
+ 64 method1() {
+ 65 var x;
+ 66 }
+ -> 67 # method2()
+ 68 {
+ => 69 |var x;
+ 70 }
+ 71 get getter1() {
+ 72 var x;
+
+INSERTING AT: 69:9
+PAUSES AT: 70:4
+ 66 }
+ 67 method2()
+ 68 {
+ -> 69 v#ar x;
+ => 70 |}
+ 71 get getter1() {
+ 72 var x;
+ 73 }
+
+INSERTING AT: 71:0
+PAUSES AT: 72:8
+ 68 {
+ 69 var x;
+ 70 }
+ -> 71 # get getter1() {
+ => 72 |var x;
+ 73 }
+ 74 get getter2()
+ 75 {
+
+INSERTING AT: 72:9
+PAUSES AT: 73:4
+ 69 var x;
+ 70 }
+ 71 get getter1() {
+ -> 72 v#ar x;
+ => 73 |}
+ 74 get getter2()
+ 75 {
+ 76 var x;
+
+INSERTING AT: 74:0
+PAUSES AT: 76:8
+ 71 get getter1() {
+ 72 var x;
+ 73 }
+ -> 74 # get getter2()
+ 75 {
+ => 76 |var x;
+ 77 }
+ 78 set setter1(x) {
+ 79 var s;
+
+INSERTING AT: 76:9
+PAUSES AT: 77:4
+ 73 }
+ 74 get getter2()
+ 75 {
+ -> 76 v#ar x;
+ => 77 |}
+ 78 set setter1(x) {
+ 79 var s;
+ 80 }
+
+INSERTING AT: 78:0
+PAUSES AT: 79:8
+ 75 {
+ 76 var x;
+ 77 }
+ -> 78 # set setter1(x) {
+ => 79 |var s;
+ 80 }
+ 81 set setter2(x)
+ 82 {
+
+INSERTING AT: 79:9
+PAUSES AT: 80:4
+ 76 var x;
+ 77 }
+ 78 set setter1(x) {
+ -> 79 v#ar s;
+ => 80 |}
+ 81 set setter2(x)
+ 82 {
+ 83 var s;
+
+INSERTING AT: 81:0
+PAUSES AT: 83:8
+ 78 set setter1(x) {
+ 79 var s;
+ 80 }
+ -> 81 # set setter2(x)
+ 82 {
+ => 83 |var s;
+ 84 }
+ 85 }
+ 86
+
+INSERTING AT: 83:9
+PAUSES AT: 84:4
+ 80 }
+ 81 set setter2(x)
+ 82 {
+ -> 83 v#ar s;
+ => 84 |}
+ 85 }
+ 86
+ 87 x => x;
+
+INSERTING AT: 87:1
+PAUSES AT: 87:5
+ 84 }
+ 85 }
+ 86
+-=> 87 x# => |x;
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+
+INSERTING AT: 87:6
+PAUSES AT: 88:0
+ 84 }
+ 85 }
+ 86
+ -> 87 x => x#;
+ => 88 |() => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+ 91 (x) => {
+
+INSERTING AT: 88:1
+PAUSES AT: 88:6
+ 85 }
+ 86
+ 87 x => x;
+-=> 88 (#) => |1;
+ 89 (x) => x;
+ 90 (x) => { x };
+ 91 (x) => {
+
+INSERTING AT: 88:7
+PAUSES AT: 89:0
+ 85 }
+ 86
+ 87 x => x;
+ -> 88 () => 1#;
+ => 89 |(x) => x;
+ 90 (x) => { x };
+ 91 (x) => {
+ 92 x
+
+INSERTING AT: 89:1
+PAUSES AT: 89:7
+ 86
+ 87 x => x;
+ 88 () => 1;
+-=> 89 (#x) => |x;
+ 90 (x) => { x };
+ 91 (x) => {
+ 92 x
+
+INSERTING AT: 89:8
+PAUSES AT: 94:0
+ 86
+ 87 x => x;
+ 88 () => 1;
+ -> 89 (x) => x#;
+ 90 (x) => { x };
+ 91 (x) => {
+ 92 x
+ 93 };
+ => 94 |() => {
+ 95 var x;
+ 96 };
+ 97
+
+INSERTING AT: 90:0
+PAUSES AT: 90:0
+ 87 x => x;
+ 88 () => 1;
+ 89 (x) => x;
+-=> 90 |(x) => { x };
+ 91 (x) => {
+ 92 x
+ 93 };
+
+INSERTING AT: 90:1
+PAUSES AT: 90:9
+ 87 x => x;
+ 88 () => 1;
+ 89 (x) => x;
+-=> 90 (#x) => { |x };
+ 91 (x) => {
+ 92 x
+ 93 };
+
+INSERTING AT: 90:10
+PAUSES AT: 90:11
+ 87 x => x;
+ 88 () => 1;
+ 89 (x) => x;
+-=> 90 (x) => { x# |};
+ 91 (x) => {
+ 92 x
+ 93 };
+
+INSERTING AT: 91:0
+PAUSES AT: 91:0
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+-=> 91 |(x) => {
+ 92 x
+ 93 };
+ 94 () => {
+
+INSERTING AT: 91:1
+PAUSES AT: 92:4
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+ -> 91 (#x) => {
+ => 92 |x
+ 93 };
+ 94 () => {
+ 95 var x;
+
+INSERTING AT: 92:5
+PAUSES AT: 93:0
+ 89 (x) => x;
+ 90 (x) => { x };
+ 91 (x) => {
+ -> 92 x#
+ => 93 |};
+ 94 () => {
+ 95 var x;
+ 96 };
+
+INSERTING AT: 94:1
+PAUSES AT: 95:4
+ 91 (x) => {
+ 92 x
+ 93 };
+ -> 94 (#) => {
+ => 95 |var x;
+ 96 };
+ 97
+ 98 var fObj = {
+
+INSERTING AT: 95:5
+PAUSES AT: 96:0
+ 92 x
+ 93 };
+ 94 () => {
+ -> 95 v#ar x;
+ => 96 |};
+ 97
+ 98 var fObj = {
+ 99 f1: function() {
+
+INSERTING AT: 96:1
+PAUSES AT: 98:0
+ 93 };
+ 94 () => {
+ 95 var x;
+ -> 96 }#;
+ 97
+ => 98 |var fObj = {
+ 99 f1: function() {
+ 100 var x;
+ 101 },
+
+INSERTING AT: 99:0
+PAUSES AT: 100:8
+ 96 };
+ 97
+ 98 var fObj = {
+ -> 99 # f1: function() {
+ => 100 |var x;
+ 101 },
+ 102 f2: function()
+ 103 {
+
+INSERTING AT: 100:9
+PAUSES AT: 101:4
+ 97
+ 98 var fObj = {
+ 99 f1: function() {
+ -> 100 v#ar x;
+ => 101 |},
+ 102 f2: function()
+ 103 {
+ 104 var x;
+
+INSERTING AT: 102:0
+PAUSES AT: 104:8
+ 99 f1: function() {
+ 100 var x;
+ 101 },
+ -> 102 # f2: function()
+ 103 {
+ => 104 |var x;
+ 105 },
+ 106 f3: () => {
+ 107 var x;
+
+INSERTING AT: 104:9
+PAUSES AT: 105:4
+ 101 },
+ 102 f2: function()
+ 103 {
+ -> 104 v#ar x;
+ => 105 |},
+ 106 f3: () => {
+ 107 var x;
+ 108 },
+
+INSERTING AT: 106:0
+PAUSES AT: 107:8
+ 103 {
+ 104 var x;
+ 105 },
+ -> 106 # f3: () => {
+ => 107 |var x;
+ 108 },
+ 109 f4: () =>
+ 110 {
+
+INSERTING AT: 107:9
+PAUSES AT: 108:4
+ 104 var x;
+ 105 },
+ 106 f3: () => {
+ -> 107 v#ar x;
+ => 108 |},
+ 109 f4: () =>
+ 110 {
+ 111 var x;
+
+INSERTING AT: 109:0
+PAUSES AT: 111:8
+ 106 f3: () => {
+ 107 var x;
+ 108 },
+ -> 109 # f4: () =>
+ 110 {
+ => 111 |var x;
+ 112 }
+ 113 };
+ 114
+
+INSERTING AT: 111:9
+PAUSES AT: 112:4
+ 108 },
+ 109 f4: () =>
+ 110 {
+ -> 111 v#ar x;
+ => 112 |}
+ 113 };
+ 114
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointsresolveddumpallpauselocationshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html (0 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html (rev 0)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../http/tests/inspector/resources/inspector-test.js"></script>
+<script src="../resources/log-pause-location.js"></script>
+<script src="resources/dump.js"></script>
+<script src="resources/dump-general.js"></script>
+<script src="resources/dump-functions.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("Debugger.resolvedBreakpoint.dumpAllLocations");
+
+ window.addDumpAllPauseLocationsTestCase(suite, {
+ name: "Debugger.resolvedBreakpoint.dumpAllLocations.General",
+ scriptRegex: /dump-general\.js$/,
+ });
+
+ window.addDumpAllPauseLocationsTestCase(suite, {
+ name: "Debugger.resolvedBreakpoint.dumpAllLocations.Functions",
+ scriptRegex: /dump-functions\.js$/,
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Checking all resolved breakpoint locations in a script.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointsresolveddumpeachlineexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-each-line-expected.txt (0 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-each-line-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-each-line-expected.txt 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -0,0 +1,4348 @@
</span><ins>+Checking resolved breakpoint locations for each line in a script.
+
+
+== Running test suite: Debugger.resolvedBreakpoint.dumpEachLine
+-- Running test case: Debugger.resolvedBreakpoint.dumpEachLine.General
+
+INSERTING AT: 0:0
+PAUSES AT: 0:0
+-=> 0 |let a=function(){return 0}
+ 1 let b=function(){return 0}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+
+
+INSERTING AT: 1:0
+PAUSES AT: 1:0
+ 0 let a=function(){return 0}
+-=> 1 |let b=function(){return 0}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+ 4 let obj={};
+
+
+INSERTING AT: 2:0
+PAUSES AT: 2:0
+ 0 let a=function(){return 0}
+ 1 let b=function(){return 0}
+-=> 2 |let c=function(){return 0}
+ 3 let arr=[];
+ 4 let obj={};
+ 5
+
+
+INSERTING AT: 3:0
+PAUSES AT: 3:0
+ 0 let a=function(){return 0}
+ 1 let b=function(){return 0}
+ 2 let c=function(){return 0}
+-=> 3 |let arr=[];
+ 4 let obj={};
+ 5
+ 6 // Control flow
+
+
+INSERTING AT: 4:0
+PAUSES AT: 4:0
+ 1 let b=function(){return 0}
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+-=> 4 |let obj={};
+ 5
+ 6 // Control flow
+ 7
+
+
+INSERTING AT: 5:0
+PAUSES AT: 8:4
+ 2 let c=function(){return 0}
+ 3 let arr=[];
+ 4 let obj={};
+ -> 5 #
+ 6 // Control flow
+ 7
+ => 8 if (|0)
+ 9 a();
+ 10
+ 11 if (0) {
+
+
+INSERTING AT: 6:0
+PAUSES AT: 8:4
+ 3 let arr=[];
+ 4 let obj={};
+ 5
+ -> 6 #// Control flow
+ 7
+ => 8 if (|0)
+ 9 a();
+ 10
+ 11 if (0) {
+
+
+INSERTING AT: 7:0
+PAUSES AT: 8:4
+ 4 let obj={};
+ 5
+ 6 // Control flow
+ -> 7 #
+ => 8 if (|0)
+ 9 a();
+ 10
+ 11 if (0) {
+
+
+INSERTING AT: 8:0
+PAUSES AT: 8:4
+ 5
+ 6 // Control flow
+ 7
+-=> 8 #if (|0)
+ 9 a();
+ 10
+ 11 if (0) {
+
+
+INSERTING AT: 9:0
+PAUSES AT: 9:4
+ 6 // Control flow
+ 7
+ 8 if (0)
+-=> 9 # |a();
+ 10
+ 11 if (0) {
+ 12 a();
+
+
+INSERTING AT: 10:0
+PAUSES AT: 11:4
+ 7
+ 8 if (0)
+ 9 a();
+ -> 10 #
+ => 11 if (|0) {
+ 12 a();
+ 13 }
+ 14
+
+
+INSERTING AT: 11:0
+PAUSES AT: 11:4
+ 8 if (0)
+ 9 a();
+ 10
+-=> 11 #if (|0) {
+ 12 a();
+ 13 }
+ 14
+
+
+INSERTING AT: 12:0
+PAUSES AT: 12:4
+ 9 a();
+ 10
+ 11 if (0) {
+-=> 12 # |a();
+ 13 }
+ 14
+ 15 if (0)
+
+
+INSERTING AT: 13:0
+PAUSES AT: 15:4
+ 10
+ 11 if (0) {
+ 12 a();
+ -> 13 #}
+ 14
+ => 15 if (|0)
+ 16 a();
+ 17 else if (0)
+ 18 a();
+
+
+INSERTING AT: 14:0
+PAUSES AT: 15:4
+ 11 if (0) {
+ 12 a();
+ 13 }
+ -> 14 #
+ => 15 if (|0)
+ 16 a();
+ 17 else if (0)
+ 18 a();
+
+
+INSERTING AT: 15:0
+PAUSES AT: 15:4
+ 12 a();
+ 13 }
+ 14
+-=> 15 #if (|0)
+ 16 a();
+ 17 else if (0)
+ 18 a();
+
+
+INSERTING AT: 16:0
+PAUSES AT: 16:4
+ 13 }
+ 14
+ 15 if (0)
+-=> 16 # |a();
+ 17 else if (0)
+ 18 a();
+ 19 else
+
+
+INSERTING AT: 17:0
+PAUSES AT: 17:9
+ 14
+ 15 if (0)
+ 16 a();
+-=> 17 #else if (|0)
+ 18 a();
+ 19 else
+ 20 a();
+
+
+INSERTING AT: 18:0
+PAUSES AT: 18:4
+ 15 if (0)
+ 16 a();
+ 17 else if (0)
+-=> 18 # |a();
+ 19 else
+ 20 a();
+ 21
+
+
+INSERTING AT: 19:0
+PAUSES AT: 20:4
+ 16 a();
+ 17 else if (0)
+ 18 a();
+ -> 19 #else
+ => 20 |a();
+ 21
+ 22 a() ? b() : c()
+ 23
+
+
+INSERTING AT: 20:0
+PAUSES AT: 20:4
+ 17 else if (0)
+ 18 a();
+ 19 else
+-=> 20 # |a();
+ 21
+ 22 a() ? b() : c()
+ 23
+
+
+INSERTING AT: 21:0
+PAUSES AT: 22:0
+ 18 a();
+ 19 else
+ 20 a();
+ -> 21 #
+ => 22 |a() ? b() : c()
+ 23
+ 24 // Loops
+ 25
+
+
+INSERTING AT: 22:0
+PAUSES AT: 22:0
+ 19 else
+ 20 a();
+ 21
+-=> 22 |a() ? b() : c()
+ 23
+ 24 // Loops
+ 25
+
+
+INSERTING AT: 23:0
+PAUSES AT: 26:7
+ 20 a();
+ 21
+ 22 a() ? b() : c()
+ -> 23 #
+ 24 // Loops
+ 25
+ => 26 while (|0)
+ 27 a();
+ 28
+ 29 while (0) {
+
+
+INSERTING AT: 24:0
+PAUSES AT: 26:7
+ 21
+ 22 a() ? b() : c()
+ 23
+ -> 24 #// Loops
+ 25
+ => 26 while (|0)
+ 27 a();
+ 28
+ 29 while (0) {
+
+
+INSERTING AT: 25:0
+PAUSES AT: 26:7
+ 22 a() ? b() : c()
+ 23
+ 24 // Loops
+ -> 25 #
+ => 26 while (|0)
+ 27 a();
+ 28
+ 29 while (0) {
+
+
+INSERTING AT: 26:0
+PAUSES AT: 26:7
+ 23
+ 24 // Loops
+ 25
+-=> 26 #while (|0)
+ 27 a();
+ 28
+ 29 while (0) {
+
+
+INSERTING AT: 27:0
+PAUSES AT: 27:4
+ 24 // Loops
+ 25
+ 26 while (0)
+-=> 27 # |a();
+ 28
+ 29 while (0) {
+ 30 a();
+
+
+INSERTING AT: 28:0
+PAUSES AT: 29:7
+ 25
+ 26 while (0)
+ 27 a();
+ -> 28 #
+ => 29 while (|0) {
+ 30 a();
+ 31 }
+ 32
+
+
+INSERTING AT: 29:0
+PAUSES AT: 29:7
+ 26 while (0)
+ 27 a();
+ 28
+-=> 29 #while (|0) {
+ 30 a();
+ 31 }
+ 32
+
+
+INSERTING AT: 30:0
+PAUSES AT: 30:4
+ 27 a();
+ 28
+ 29 while (0) {
+-=> 30 # |a();
+ 31 }
+ 32
+ 33 do {
+
+
+INSERTING AT: 31:0
+PAUSES AT: 34:4
+ 28
+ 29 while (0) {
+ 30 a();
+ -> 31 #}
+ 32
+ 33 do {
+ => 34 |a();
+ 35 } while (0);
+ 36
+ 37 for (a(); b(); c())
+
+
+INSERTING AT: 32:0
+PAUSES AT: 34:4
+ 29 while (0) {
+ 30 a();
+ 31 }
+ -> 32 #
+ 33 do {
+ => 34 |a();
+ 35 } while (0);
+ 36
+ 37 for (a(); b(); c())
+
+
+INSERTING AT: 33:0
+PAUSES AT: 34:4
+ 30 a();
+ 31 }
+ 32
+ -> 33 #do {
+ => 34 |a();
+ 35 } while (0);
+ 36
+ 37 for (a(); b(); c())
+
+
+INSERTING AT: 34:0
+PAUSES AT: 34:4
+ 31 }
+ 32
+ 33 do {
+-=> 34 # |a();
+ 35 } while (0);
+ 36
+ 37 for (a(); b(); c())
+
+
+INSERTING AT: 35:0
+PAUSES AT: 35:9
+ 32
+ 33 do {
+ 34 a();
+-=> 35 #} while (|0);
+ 36
+ 37 for (a(); b(); c())
+ 38 break;
+
+
+INSERTING AT: 36:0
+PAUSES AT: 37:5
+ 33 do {
+ 34 a();
+ 35 } while (0);
+ -> 36 #
+ => 37 for (|a(); b(); c())
+ 38 break;
+ 39
+ 40 for (; b(); c())
+
+
+INSERTING AT: 37:0
+PAUSES AT: 37:5
+ 34 a();
+ 35 } while (0);
+ 36
+-=> 37 #for (|a(); b(); c())
+ 38 break;
+ 39
+ 40 for (; b(); c())
+
+
+INSERTING AT: 38:0
+PAUSES AT: 38:4
+ 35 } while (0);
+ 36
+ 37 for (a(); b(); c())
+-=> 38 # |break;
+ 39
+ 40 for (; b(); c())
+ 41 break;
+
+
+INSERTING AT: 39:0
+PAUSES AT: 40:7
+ 36
+ 37 for (a(); b(); c())
+ 38 break;
+ -> 39 #
+ => 40 for (; |b(); c())
+ 41 break;
+ 42
+ 43 for (a(); b();)
+
+
+INSERTING AT: 40:0
+PAUSES AT: 40:7
+ 37 for (a(); b(); c())
+ 38 break;
+ 39
+-=> 40 #for (; |b(); c())
+ 41 break;
+ 42
+ 43 for (a(); b();)
+
+
+INSERTING AT: 41:0
+PAUSES AT: 41:4
+ 38 break;
+ 39
+ 40 for (; b(); c())
+-=> 41 # |break;
+ 42
+ 43 for (a(); b();)
+ 44 break;
+
+
+INSERTING AT: 42:0
+PAUSES AT: 43:5
+ 39
+ 40 for (; b(); c())
+ 41 break;
+ -> 42 #
+ => 43 for (|a(); b();)
+ 44 break;
+ 45
+ 46 for (a();; c())
+
+
+INSERTING AT: 43:0
+PAUSES AT: 43:5
+ 40 for (; b(); c())
+ 41 break;
+ 42
+-=> 43 #for (|a(); b();)
+ 44 break;
+ 45
+ 46 for (a();; c())
+
+
+INSERTING AT: 44:0
+PAUSES AT: 44:4
+ 41 break;
+ 42
+ 43 for (a(); b();)
+-=> 44 # |break;
+ 45
+ 46 for (a();; c())
+ 47 break;
+
+
+INSERTING AT: 45:0
+PAUSES AT: 46:5
+ 42
+ 43 for (a(); b();)
+ 44 break;
+ -> 45 #
+ => 46 for (|a();; c())
+ 47 break;
+ 48
+ 49 for (a();;)
+
+
+INSERTING AT: 46:0
+PAUSES AT: 46:5
+ 43 for (a(); b();)
+ 44 break;
+ 45
+-=> 46 #for (|a();; c())
+ 47 break;
+ 48
+ 49 for (a();;)
+
+
+INSERTING AT: 47:0
+PAUSES AT: 47:4
+ 44 break;
+ 45
+ 46 for (a();; c())
+-=> 47 # |break;
+ 48
+ 49 for (a();;)
+ 50 break;
+
+
+INSERTING AT: 48:0
+PAUSES AT: 49:5
+ 45
+ 46 for (a();; c())
+ 47 break;
+ -> 48 #
+ => 49 for (|a();;)
+ 50 break;
+ 51
+ 52 for (; b();)
+
+
+INSERTING AT: 49:0
+PAUSES AT: 49:5
+ 46 for (a();; c())
+ 47 break;
+ 48
+-=> 49 #for (|a();;)
+ 50 break;
+ 51
+ 52 for (; b();)
+
+
+INSERTING AT: 50:0
+PAUSES AT: 50:4
+ 47 break;
+ 48
+ 49 for (a();;)
+-=> 50 # |break;
+ 51
+ 52 for (; b();)
+ 53 break;
+
+
+INSERTING AT: 51:0
+PAUSES AT: 52:7
+ 48
+ 49 for (a();;)
+ 50 break;
+ -> 51 #
+ => 52 for (; |b();)
+ 53 break;
+ 54
+ 55 for (;; c())
+
+
+INSERTING AT: 52:0
+PAUSES AT: 52:7
+ 49 for (a();;)
+ 50 break;
+ 51
+-=> 52 #for (; |b();)
+ 53 break;
+ 54
+ 55 for (;; c())
+
+
+INSERTING AT: 53:0
+PAUSES AT: 53:4
+ 50 break;
+ 51
+ 52 for (; b();)
+-=> 53 # |break;
+ 54
+ 55 for (;; c())
+ 56 break;
+
+
+INSERTING AT: 54:0
+PAUSES AT: 55:8
+ 51
+ 52 for (; b();)
+ 53 break;
+ -> 54 #
+ => 55 for (;; |c())
+ 56 break;
+ 57
+ 58 for (;;)
+
+
+INSERTING AT: 55:0
+PAUSES AT: 55:8
+ 52 for (; b();)
+ 53 break;
+ 54
+-=> 55 #for (;; |c())
+ 56 break;
+ 57
+ 58 for (;;)
+
+
+INSERTING AT: 56:0
+PAUSES AT: 56:4
+ 53 break;
+ 54
+ 55 for (;; c())
+-=> 56 # |break;
+ 57
+ 58 for (;;)
+ 59 break;
+
+
+INSERTING AT: 57:0
+PAUSES AT: 59:4
+ 54
+ 55 for (;; c())
+ 56 break;
+ -> 57 #
+ 58 for (;;)
+ => 59 |break;
+ 60
+ 61 for (a(); b(); c()) {
+ 62 break;
+
+
+INSERTING AT: 58:0
+PAUSES AT: 59:4
+ 55 for (;; c())
+ 56 break;
+ 57
+ -> 58 #for (;;)
+ => 59 |break;
+ 60
+ 61 for (a(); b(); c()) {
+ 62 break;
+
+
+INSERTING AT: 59:0
+PAUSES AT: 59:4
+ 56 break;
+ 57
+ 58 for (;;)
+-=> 59 # |break;
+ 60
+ 61 for (a(); b(); c()) {
+ 62 break;
+
+
+INSERTING AT: 60:0
+PAUSES AT: 61:5
+ 57
+ 58 for (;;)
+ 59 break;
+ -> 60 #
+ => 61 for (|a(); b(); c()) {
+ 62 break;
+ 63 }
+ 64
+
+
+INSERTING AT: 61:0
+PAUSES AT: 61:5
+ 58 for (;;)
+ 59 break;
+ 60
+-=> 61 #for (|a(); b(); c()) {
+ 62 break;
+ 63 }
+ 64
+
+
+INSERTING AT: 62:0
+PAUSES AT: 62:4
+ 59 break;
+ 60
+ 61 for (a(); b(); c()) {
+-=> 62 # |break;
+ 63 }
+ 64
+ 65 for (let x of arr)
+
+
+INSERTING AT: 63:0
+PAUSES AT: 65:14
+ 60
+ 61 for (a(); b(); c()) {
+ 62 break;
+ -> 63 #}
+ 64
+ => 65 for (let x of |arr)
+ 66 break;
+ 67
+ 68 for (let x in obj)
+
+
+INSERTING AT: 64:0
+PAUSES AT: 65:14
+ 61 for (a(); b(); c()) {
+ 62 break;
+ 63 }
+ -> 64 #
+ => 65 for (let x of |arr)
+ 66 break;
+ 67
+ 68 for (let x in obj)
+
+
+INSERTING AT: 65:0
+PAUSES AT: 65:14
+ 62 break;
+ 63 }
+ 64
+-=> 65 #for (let x of |arr)
+ 66 break;
+ 67
+ 68 for (let x in obj)
+
+
+INSERTING AT: 66:0
+PAUSES AT: 66:4
+ 63 }
+ 64
+ 65 for (let x of arr)
+-=> 66 # |break;
+ 67
+ 68 for (let x in obj)
+ 69 break;
+
+
+INSERTING AT: 67:0
+PAUSES AT: 68:14
+ 64
+ 65 for (let x of arr)
+ 66 break;
+ -> 67 #
+ => 68 for (let x in |obj)
+ 69 break;
+ 70
+ 71 // Switch
+
+
+INSERTING AT: 68:0
+PAUSES AT: 68:14
+ 65 for (let x of arr)
+ 66 break;
+ 67
+-=> 68 #for (let x in |obj)
+ 69 break;
+ 70
+ 71 // Switch
+
+
+INSERTING AT: 69:0
+PAUSES AT: 69:4
+ 66 break;
+ 67
+ 68 for (let x in obj)
+-=> 69 # |break;
+ 70
+ 71 // Switch
+ 72
+
+
+INSERTING AT: 70:0
+PAUSES AT: 73:8
+ 67
+ 68 for (let x in obj)
+ 69 break;
+ -> 70 #
+ 71 // Switch
+ 72
+ => 73 switch (|0) {
+ 74 case 1:
+ 75 a();
+ 76 break;
+
+
+INSERTING AT: 71:0
+PAUSES AT: 73:8
+ 68 for (let x in obj)
+ 69 break;
+ 70
+ -> 71 #// Switch
+ 72
+ => 73 switch (|0) {
+ 74 case 1:
+ 75 a();
+ 76 break;
+
+
+INSERTING AT: 72:0
+PAUSES AT: 73:8
+ 69 break;
+ 70
+ 71 // Switch
+ -> 72 #
+ => 73 switch (|0) {
+ 74 case 1:
+ 75 a();
+ 76 break;
+
+
+INSERTING AT: 73:0
+PAUSES AT: 73:8
+ 70
+ 71 // Switch
+ 72
+-=> 73 #switch (|0) {
+ 74 case 1:
+ 75 a();
+ 76 break;
+
+
+INSERTING AT: 74:0
+PAUSES AT: 75:4
+ 71 // Switch
+ 72
+ 73 switch (0) {
+ -> 74 #case 1:
+ => 75 |a();
+ 76 break;
+ 77 case 2:
+ 78 a();
+
+
+INSERTING AT: 75:0
+PAUSES AT: 75:4
+ 72
+ 73 switch (0) {
+ 74 case 1:
+-=> 75 # |a();
+ 76 break;
+ 77 case 2:
+ 78 a();
+
+
+INSERTING AT: 76:0
+PAUSES AT: 76:4
+ 73 switch (0) {
+ 74 case 1:
+ 75 a();
+-=> 76 # |break;
+ 77 case 2:
+ 78 a();
+ 79 // fallthrough
+
+
+INSERTING AT: 77:0
+PAUSES AT: 78:4
+ 74 case 1:
+ 75 a();
+ 76 break;
+ -> 77 #case 2:
+ => 78 |a();
+ 79 // fallthrough
+ 80 case 3:
+ 81 a();
+
+
+INSERTING AT: 78:0
+PAUSES AT: 78:4
+ 75 a();
+ 76 break;
+ 77 case 2:
+-=> 78 # |a();
+ 79 // fallthrough
+ 80 case 3:
+ 81 a();
+
+
+INSERTING AT: 79:0
+PAUSES AT: 81:4
+ 76 break;
+ 77 case 2:
+ 78 a();
+ -> 79 # // fallthrough
+ 80 case 3:
+ => 81 |a();
+ 82 break;
+ 83 default:
+ 84 a();
+
+
+INSERTING AT: 80:0
+PAUSES AT: 81:4
+ 77 case 2:
+ 78 a();
+ 79 // fallthrough
+ -> 80 #case 3:
+ => 81 |a();
+ 82 break;
+ 83 default:
+ 84 a();
+
+
+INSERTING AT: 81:0
+PAUSES AT: 81:4
+ 78 a();
+ 79 // fallthrough
+ 80 case 3:
+-=> 81 # |a();
+ 82 break;
+ 83 default:
+ 84 a();
+
+
+INSERTING AT: 82:0
+PAUSES AT: 82:4
+ 79 // fallthrough
+ 80 case 3:
+ 81 a();
+-=> 82 # |break;
+ 83 default:
+ 84 a();
+ 85 break;
+
+
+INSERTING AT: 83:0
+PAUSES AT: 84:4
+ 80 case 3:
+ 81 a();
+ 82 break;
+ -> 83 #default:
+ => 84 |a();
+ 85 break;
+ 86 }
+ 87
+
+
+INSERTING AT: 84:0
+PAUSES AT: 84:4
+ 81 a();
+ 82 break;
+ 83 default:
+-=> 84 # |a();
+ 85 break;
+ 86 }
+ 87
+
+
+INSERTING AT: 85:0
+PAUSES AT: 85:4
+ 82 break;
+ 83 default:
+ 84 a();
+-=> 85 # |break;
+ 86 }
+ 87
+ 88 // Try/Catch
+
+
+INSERTING AT: 86:0
+PAUSES AT: 91:4
+ 83 default:
+ 84 a();
+ 85 break;
+ -> 86 #}
+ 87
+ 88 // Try/Catch
+ 89
+ 90 try {
+ => 91 |a();
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ 94 } finally {
+
+
+INSERTING AT: 87:0
+PAUSES AT: 91:4
+ 84 a();
+ 85 break;
+ 86 }
+ -> 87 #
+ 88 // Try/Catch
+ 89
+ 90 try {
+ => 91 |a();
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ 94 } finally {
+
+
+INSERTING AT: 88:0
+PAUSES AT: 91:4
+ 85 break;
+ 86 }
+ 87
+ -> 88 #// Try/Catch
+ 89
+ 90 try {
+ => 91 |a();
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ 94 } finally {
+
+
+INSERTING AT: 89:0
+PAUSES AT: 91:4
+ 86 }
+ 87
+ 88 // Try/Catch
+ -> 89 #
+ 90 try {
+ => 91 |a();
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ 94 } finally {
+
+
+INSERTING AT: 90:0
+PAUSES AT: 91:4
+ 87
+ 88 // Try/Catch
+ 89
+ -> 90 #try {
+ => 91 |a();
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ 94 } finally {
+
+
+INSERTING AT: 91:0
+PAUSES AT: 91:4
+ 88 // Try/Catch
+ 89
+ 90 try {
+-=> 91 # |a();
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ 94 } finally {
+
+
+INSERTING AT: 92:0
+PAUSES AT: 93:4
+ 89
+ 90 try {
+ 91 a();
+ -> 92 #} catch (e) {
+ => 93 |shouldNotBeReached();
+ 94 } finally {
+ 95 b();
+ 96 }
+
+
+INSERTING AT: 93:0
+PAUSES AT: 93:4
+ 90 try {
+ 91 a();
+ 92 } catch (e) {
+-=> 93 # |shouldNotBeReached();
+ 94 } finally {
+ 95 b();
+ 96 }
+
+
+INSERTING AT: 94:0
+PAUSES AT: 95:4
+ 91 a();
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ -> 94 #} finally {
+ => 95 |b();
+ 96 }
+ 97
+ 98 // Class
+
+
+INSERTING AT: 95:0
+PAUSES AT: 95:4
+ 92 } catch (e) {
+ 93 shouldNotBeReached();
+ 94 } finally {
+-=> 95 # |b();
+ 96 }
+ 97
+ 98 // Class
+
+
+INSERTING AT: 96:0
+PAUSES AT: 151:8
+ 93 shouldNotBeReached();
+ 94 } finally {
+ 95 b();
+ -> 96 #}
+ 97
+ 98 // Class
+ 99
+ 100 class Base {
+ 101 constructor()
+ 102 {
+ 103 this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+ 107 {
+ 108 a();
+ 109 }
+ 110
+ 111 method()
+ 112 {
+ 113 a();
+ 114 }
+ 115 }
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 97:0
+PAUSES AT: 151:8
+ 94 } finally {
+ 95 b();
+ 96 }
+ -> 97 #
+ 98 // Class
+ 99
+ 100 class Base {
+ 101 constructor()
+ 102 {
+ 103 this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+ 107 {
+ 108 a();
+ 109 }
+ 110
+ 111 method()
+ 112 {
+ 113 a();
+ 114 }
+ 115 }
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 98:0
+PAUSES AT: 151:8
+ 95 b();
+ 96 }
+ 97
+ -> 98 #// Class
+ 99
+ 100 class Base {
+ 101 constructor()
+ 102 {
+ 103 this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+ 107 {
+ 108 a();
+ 109 }
+ 110
+ 111 method()
+ 112 {
+ 113 a();
+ 114 }
+ 115 }
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 99:0
+PAUSES AT: 151:8
+ 96 }
+ 97
+ 98 // Class
+ -> 99 #
+ 100 class Base {
+ 101 constructor()
+ 102 {
+ 103 this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+ 107 {
+ 108 a();
+ 109 }
+ 110
+ 111 method()
+ 112 {
+ 113 a();
+ 114 }
+ 115 }
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 100:0
+PAUSES AT: 151:8
+ 97
+ 98 // Class
+ 99
+ -> 100 #class Base {
+ 101 constructor()
+ 102 {
+ 103 this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+ 107 {
+ 108 a();
+ 109 }
+ 110
+ 111 method()
+ 112 {
+ 113 a();
+ 114 }
+ 115 }
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 101:0
+PAUSES AT: 103:8
+ 98 // Class
+ 99
+ 100 class Base {
+ -> 101 # constructor()
+ 102 {
+ => 103 |this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+
+
+INSERTING AT: 102:0
+PAUSES AT: 103:8
+ 99
+ 100 class Base {
+ 101 constructor()
+ -> 102 # {
+ => 103 |this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+
+
+INSERTING AT: 103:0
+PAUSES AT: 103:8
+ 100 class Base {
+ 101 constructor()
+ 102 {
+-=> 103 # |this._base = true;
+ 104 }
+ 105
+ 106 baseMethod()
+
+
+INSERTING AT: 104:0
+PAUSES AT: 104:4
+ 101 constructor()
+ 102 {
+ 103 this._base = true;
+-=> 104 # |}
+ 105
+ 106 baseMethod()
+ 107 {
+
+
+INSERTING AT: 105:0
+PAUSES AT: 151:8
+ 102 {
+ 103 this._base = true;
+ 104 }
+ -> 105 #
+ 106 baseMethod()
+ 107 {
+ 108 a();
+ 109 }
+ 110
+ 111 method()
+ 112 {
+ 113 a();
+ 114 }
+ 115 }
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 106:0
+PAUSES AT: 108:8
+ 103 this._base = true;
+ 104 }
+ 105
+ -> 106 # baseMethod()
+ 107 {
+ => 108 |a();
+ 109 }
+ 110
+ 111 method()
+
+
+INSERTING AT: 107:0
+PAUSES AT: 108:8
+ 104 }
+ 105
+ 106 baseMethod()
+ -> 107 # {
+ => 108 |a();
+ 109 }
+ 110
+ 111 method()
+
+
+INSERTING AT: 108:0
+PAUSES AT: 108:8
+ 105
+ 106 baseMethod()
+ 107 {
+-=> 108 # |a();
+ 109 }
+ 110
+ 111 method()
+
+
+INSERTING AT: 109:0
+PAUSES AT: 109:4
+ 106 baseMethod()
+ 107 {
+ 108 a();
+-=> 109 # |}
+ 110
+ 111 method()
+ 112 {
+
+
+INSERTING AT: 110:0
+PAUSES AT: 151:8
+ 107 {
+ 108 a();
+ 109 }
+ -> 110 #
+ 111 method()
+ 112 {
+ 113 a();
+ 114 }
+ 115 }
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 111:0
+PAUSES AT: 113:8
+ 108 a();
+ 109 }
+ 110
+ -> 111 # method()
+ 112 {
+ => 113 |a();
+ 114 }
+ 115 }
+ 116
+
+
+INSERTING AT: 112:0
+PAUSES AT: 113:8
+ 109 }
+ 110
+ 111 method()
+ -> 112 # {
+ => 113 |a();
+ 114 }
+ 115 }
+ 116
+
+
+INSERTING AT: 113:0
+PAUSES AT: 113:8
+ 110
+ 111 method()
+ 112 {
+-=> 113 # |a();
+ 114 }
+ 115 }
+ 116
+
+
+INSERTING AT: 114:0
+PAUSES AT: 114:4
+ 111 method()
+ 112 {
+ 113 a();
+-=> 114 # |}
+ 115 }
+ 116
+ 117 class Child extends Base {
+
+
+INSERTING AT: 115:0
+PAUSES AT: 151:8
+ 112 {
+ 113 a();
+ 114 }
+ -> 115 #}
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 116:0
+PAUSES AT: 151:8
+ 113 a();
+ 114 }
+ 115 }
+ -> 116 #
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 117:0
+PAUSES AT: 151:8
+ 114 }
+ 115 }
+ 116
+ -> 117 #class Child extends Base {
+ 118 constructor()
+ 119 {
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 118:0
+PAUSES AT: 120:8
+ 115 }
+ 116
+ 117 class Child extends Base {
+ -> 118 # constructor()
+ 119 {
+ => 120 |super();
+ 121 this._child = true;
+ 122 }
+ 123
+
+
+INSERTING AT: 119:0
+PAUSES AT: 120:8
+ 116
+ 117 class Child extends Base {
+ 118 constructor()
+ -> 119 # {
+ => 120 |super();
+ 121 this._child = true;
+ 122 }
+ 123
+
+
+INSERTING AT: 120:0
+PAUSES AT: 120:8
+ 117 class Child extends Base {
+ 118 constructor()
+ 119 {
+-=> 120 # |super();
+ 121 this._child = true;
+ 122 }
+ 123
+
+
+INSERTING AT: 121:0
+PAUSES AT: 121:8
+ 118 constructor()
+ 119 {
+ 120 super();
+-=> 121 # |this._child = true;
+ 122 }
+ 123
+ 124 childMethod()
+
+
+INSERTING AT: 122:0
+PAUSES AT: 122:4
+ 119 {
+ 120 super();
+ 121 this._child = true;
+-=> 122 # |}
+ 123
+ 124 childMethod()
+ 125 {
+
+
+INSERTING AT: 123:0
+PAUSES AT: 151:8
+ 120 super();
+ 121 this._child = true;
+ 122 }
+ -> 123 #
+ 124 childMethod()
+ 125 {
+ 126 b();
+ 127 }
+ 128
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 124:0
+PAUSES AT: 126:8
+ 121 this._child = true;
+ 122 }
+ 123
+ -> 124 # childMethod()
+ 125 {
+ => 126 |b();
+ 127 }
+ 128
+ 129 method()
+
+
+INSERTING AT: 125:0
+PAUSES AT: 126:8
+ 122 }
+ 123
+ 124 childMethod()
+ -> 125 # {
+ => 126 |b();
+ 127 }
+ 128
+ 129 method()
+
+
+INSERTING AT: 126:0
+PAUSES AT: 126:8
+ 123
+ 124 childMethod()
+ 125 {
+-=> 126 # |b();
+ 127 }
+ 128
+ 129 method()
+
+
+INSERTING AT: 127:0
+PAUSES AT: 127:4
+ 124 childMethod()
+ 125 {
+ 126 b();
+-=> 127 # |}
+ 128
+ 129 method()
+ 130 {
+
+
+INSERTING AT: 128:0
+PAUSES AT: 151:8
+ 125 {
+ 126 b();
+ 127 }
+ -> 128 #
+ 129 method()
+ 130 {
+ 131 super.method();
+ 132 b();
+ 133 }
+ 134
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 129:0
+PAUSES AT: 131:8
+ 126 b();
+ 127 }
+ 128
+ -> 129 # method()
+ 130 {
+ => 131 |super.method();
+ 132 b();
+ 133 }
+ 134
+
+
+INSERTING AT: 130:0
+PAUSES AT: 131:8
+ 127 }
+ 128
+ 129 method()
+ -> 130 # {
+ => 131 |super.method();
+ 132 b();
+ 133 }
+ 134
+
+
+INSERTING AT: 131:0
+PAUSES AT: 131:8
+ 128
+ 129 method()
+ 130 {
+-=> 131 # |super.method();
+ 132 b();
+ 133 }
+ 134
+
+
+INSERTING AT: 132:0
+PAUSES AT: 132:8
+ 129 method()
+ 130 {
+ 131 super.method();
+-=> 132 # |b();
+ 133 }
+ 134
+ 135 get name()
+
+
+INSERTING AT: 133:0
+PAUSES AT: 133:4
+ 130 {
+ 131 super.method();
+ 132 b();
+-=> 133 # |}
+ 134
+ 135 get name()
+ 136 {
+
+
+INSERTING AT: 134:0
+PAUSES AT: 151:8
+ 131 super.method();
+ 132 b();
+ 133 }
+ -> 134 #
+ 135 get name()
+ 136 {
+ 137 return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 135:0
+PAUSES AT: 137:8
+ 132 b();
+ 133 }
+ 134
+ -> 135 # get name()
+ 136 {
+ => 137 |return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+
+
+INSERTING AT: 136:0
+PAUSES AT: 137:8
+ 133 }
+ 134
+ 135 get name()
+ -> 136 # {
+ => 137 |return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+
+
+INSERTING AT: 137:0
+PAUSES AT: 137:8
+ 134
+ 135 get name()
+ 136 {
+-=> 137 # |return this._name;
+ 138 }
+ 139
+ 140 set name(x)
+
+
+INSERTING AT: 138:0
+PAUSES AT: 138:4
+ 135 get name()
+ 136 {
+ 137 return this._name;
+-=> 138 # |}
+ 139
+ 140 set name(x)
+ 141 {
+
+
+INSERTING AT: 139:0
+PAUSES AT: 151:8
+ 136 {
+ 137 return this._name;
+ 138 }
+ -> 139 #
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+ 143 }
+ 144 }
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 140:0
+PAUSES AT: 142:8
+ 137 return this._name;
+ 138 }
+ 139
+ -> 140 # set name(x)
+ 141 {
+ => 142 |this._name = x;
+ 143 }
+ 144 }
+ 145
+
+
+INSERTING AT: 141:0
+PAUSES AT: 142:8
+ 138 }
+ 139
+ 140 set name(x)
+ -> 141 # {
+ => 142 |this._name = x;
+ 143 }
+ 144 }
+ 145
+
+
+INSERTING AT: 142:0
+PAUSES AT: 142:8
+ 139
+ 140 set name(x)
+ 141 {
+-=> 142 # |this._name = x;
+ 143 }
+ 144 }
+ 145
+
+
+INSERTING AT: 143:0
+PAUSES AT: 143:4
+ 140 set name(x)
+ 141 {
+ 142 this._name = x;
+-=> 143 # |}
+ 144 }
+ 145
+ 146 // ---------
+
+
+INSERTING AT: 144:0
+PAUSES AT: 151:8
+ 141 {
+ 142 this._name = x;
+ 143 }
+ -> 144 #}
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 145:0
+PAUSES AT: 151:8
+ 142 this._name = x;
+ 143 }
+ 144 }
+ -> 145 #
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 146:0
+PAUSES AT: 151:8
+ 143 }
+ 144 }
+ 145
+ -> 146 #// ---------
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 147:0
+PAUSES AT: 151:8
+ 144 }
+ 145
+ 146 // ---------
+ -> 147 #/* Misc */
+ 148 // ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 148:0
+PAUSES AT: 151:8
+ 145
+ 146 // ---------
+ 147 /* Misc */
+ -> 148 #// ---------
+ 149
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 149:0
+PAUSES AT: 151:8
+ 146 // ---------
+ 147 /* Misc */
+ 148 // ---------
+ -> 149 #
+ 150 {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 150:0
+PAUSES AT: 151:8
+ 147 /* Misc */
+ 148 // ---------
+ 149
+ -> 150 # {
+ => 151 |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 151:0
+PAUSES AT: 151:8
+ 148 // ---------
+ 149
+ 150 {
+-=> 151 # |a();
+ 152 }
+ 153
+ 154 label:
+
+
+INSERTING AT: 152:0
+PAUSES AT: 156:8
+ 149
+ 150 {
+ 151 a();
+ -> 152 # }
+ 153
+ 154 label:
+ 155 {
+ => 156 |a();
+ 157 }
+ 158
+ 159 var w1 = {x:1, y:2};
+
+
+INSERTING AT: 153:0
+PAUSES AT: 156:8
+ 150 {
+ 151 a();
+ 152 }
+ -> 153 #
+ 154 label:
+ 155 {
+ => 156 |a();
+ 157 }
+ 158
+ 159 var w1 = {x:1, y:2};
+
+
+INSERTING AT: 154:0
+PAUSES AT: 156:8
+ 151 a();
+ 152 }
+ 153
+ -> 154 #label:
+ 155 {
+ => 156 |a();
+ 157 }
+ 158
+ 159 var w1 = {x:1, y:2};
+
+
+INSERTING AT: 155:0
+PAUSES AT: 156:8
+ 152 }
+ 153
+ 154 label:
+ -> 155 # {
+ => 156 |a();
+ 157 }
+ 158
+ 159 var w1 = {x:1, y:2};
+
+
+INSERTING AT: 156:0
+PAUSES AT: 156:8
+ 153
+ 154 label:
+ 155 {
+-=> 156 # |a();
+ 157 }
+ 158
+ 159 var w1 = {x:1, y:2};
+
+
+INSERTING AT: 157:0
+PAUSES AT: 159:0
+ 154 label:
+ 155 {
+ 156 a();
+ -> 157 # }
+ 158
+ => 159 |var w1 = {x:1, y:2};
+ 160 with (w1) {
+ 161 a();
+ 162 }
+
+
+INSERTING AT: 158:0
+PAUSES AT: 159:0
+ 155 {
+ 156 a();
+ 157 }
+ -> 158 #
+ => 159 |var w1 = {x:1, y:2};
+ 160 with (w1) {
+ 161 a();
+ 162 }
+
+
+INSERTING AT: 159:0
+PAUSES AT: 159:0
+ 156 a();
+ 157 }
+ 158
+-=> 159 |var w1 = {x:1, y:2};
+ 160 with (w1) {
+ 161 a();
+ 162 }
+
+
+INSERTING AT: 160:0
+PAUSES AT: 160:6
+ 157 }
+ 158
+ 159 var w1 = {x:1, y:2};
+-=> 160 #with (|w1) {
+ 161 a();
+ 162 }
+ 163
+
+
+INSERTING AT: 161:0
+PAUSES AT: 161:4
+ 158
+ 159 var w1 = {x:1, y:2};
+ 160 with (w1) {
+-=> 161 # |a();
+ 162 }
+ 163
+ 164 var v1 = 1,
+
+
+INSERTING AT: 162:0
+PAUSES AT: 164:0
+ 159 var w1 = {x:1, y:2};
+ 160 with (w1) {
+ 161 a();
+ -> 162 #}
+ 163
+ => 164 |var v1 = 1,
+ 165 v2 = 1;
+ 166 let l1 = 2,
+ 167 l2 = 2;
+
+
+INSERTING AT: 163:0
+PAUSES AT: 164:0
+ 160 with (w1) {
+ 161 a();
+ 162 }
+ -> 163 #
+ => 164 |var v1 = 1,
+ 165 v2 = 1;
+ 166 let l1 = 2,
+ 167 l2 = 2;
+
+
+INSERTING AT: 164:0
+PAUSES AT: 164:0
+ 161 a();
+ 162 }
+ 163
+-=> 164 |var v1 = 1,
+ 165 v2 = 1;
+ 166 let l1 = 2,
+ 167 l2 = 2;
+
+
+INSERTING AT: 165:0
+PAUSES AT: 166:0
+ 162 }
+ 163
+ 164 var v1 = 1,
+ -> 165 # v2 = 1;
+ => 166 |let l1 = 2,
+ 167 l2 = 2;
+ 168 const c1 = 3,
+ 169 c2 = 3;
+
+
+INSERTING AT: 166:0
+PAUSES AT: 166:0
+ 163
+ 164 var v1 = 1,
+ 165 v2 = 1;
+-=> 166 |let l1 = 2,
+ 167 l2 = 2;
+ 168 const c1 = 3,
+ 169 c2 = 3;
+
+
+INSERTING AT: 167:0
+PAUSES AT: 168:0
+ 164 var v1 = 1,
+ 165 v2 = 1;
+ 166 let l1 = 2,
+ -> 167 # l2 = 2;
+ => 168 |const c1 = 3,
+ 169 c2 = 3;
+ 170
+ 171 v1 = v2 = v1;
+
+
+INSERTING AT: 168:0
+PAUSES AT: 168:0
+ 165 v2 = 1;
+ 166 let l1 = 2,
+ 167 l2 = 2;
+-=> 168 |const c1 = 3,
+ 169 c2 = 3;
+ 170
+ 171 v1 = v2 = v1;
+
+
+INSERTING AT: 169:0
+PAUSES AT: 171:0
+ 166 let l1 = 2,
+ 167 l2 = 2;
+ 168 const c1 = 3,
+ -> 169 # c2 = 3;
+ 170
+ => 171 |v1 = v2 = v1;
+ 172
+ 173 var {x, y} = obj;
+ 174 var [w, z] = arr;
+
+
+INSERTING AT: 170:0
+PAUSES AT: 171:0
+ 167 l2 = 2;
+ 168 const c1 = 3,
+ 169 c2 = 3;
+ -> 170 #
+ => 171 |v1 = v2 = v1;
+ 172
+ 173 var {x, y} = obj;
+ 174 var [w, z] = arr;
+
+
+INSERTING AT: 171:0
+PAUSES AT: 171:0
+ 168 const c1 = 3,
+ 169 c2 = 3;
+ 170
+-=> 171 |v1 = v2 = v1;
+ 172
+ 173 var {x, y} = obj;
+ 174 var [w, z] = arr;
+
+
+INSERTING AT: 172:0
+PAUSES AT: 173:0
+ 169 c2 = 3;
+ 170
+ 171 v1 = v2 = v1;
+ -> 172 #
+ => 173 |var {x, y} = obj;
+ 174 var [w, z] = arr;
+ 175
+ 176 var o1 = {
+
+
+INSERTING AT: 173:0
+PAUSES AT: 173:0
+ 170
+ 171 v1 = v2 = v1;
+ 172
+-=> 173 |var {x, y} = obj;
+ 174 var [w, z] = arr;
+ 175
+ 176 var o1 = {
+
+
+INSERTING AT: 174:0
+PAUSES AT: 174:0
+ 171 v1 = v2 = v1;
+ 172
+ 173 var {x, y} = obj;
+-=> 174 |var [w, z] = arr;
+ 175
+ 176 var o1 = {
+ 177 p1: 1,
+
+
+INSERTING AT: 175:0
+PAUSES AT: 176:0
+ 172
+ 173 var {x, y} = obj;
+ 174 var [w, z] = arr;
+ -> 175 #
+ => 176 |var o1 = {
+ 177 p1: 1,
+ 178 p2: a(),
+ 179 p3: 1,
+
+
+INSERTING AT: 176:0
+PAUSES AT: 176:0
+ 173 var {x, y} = obj;
+ 174 var [w, z] = arr;
+ 175
+-=> 176 |var o1 = {
+ 177 p1: 1,
+ 178 p2: a(),
+ 179 p3: 1,
+
+
+INSERTING AT: 177:0
+PAUSES AT: 184:0
+ 174 var [w, z] = arr;
+ 175
+ 176 var o1 = {
+ -> 177 # p1: 1,
+ 178 p2: a(),
+ 179 p3: 1,
+ 180 ["p4"]: 1,
+ 181 [b()]: 1,
+ 182 };
+ 183
+ => 184 |var a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+
+
+INSERTING AT: 178:0
+PAUSES AT: 184:0
+ 175
+ 176 var o1 = {
+ 177 p1: 1,
+ -> 178 # p2: a(),
+ 179 p3: 1,
+ 180 ["p4"]: 1,
+ 181 [b()]: 1,
+ 182 };
+ 183
+ => 184 |var a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+
+
+INSERTING AT: 179:0
+PAUSES AT: 184:0
+ 176 var o1 = {
+ 177 p1: 1,
+ 178 p2: a(),
+ -> 179 # p3: 1,
+ 180 ["p4"]: 1,
+ 181 [b()]: 1,
+ 182 };
+ 183
+ => 184 |var a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+
+
+INSERTING AT: 180:0
+PAUSES AT: 184:0
+ 177 p1: 1,
+ 178 p2: a(),
+ 179 p3: 1,
+ -> 180 # ["p4"]: 1,
+ 181 [b()]: 1,
+ 182 };
+ 183
+ => 184 |var a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+
+
+INSERTING AT: 181:0
+PAUSES AT: 184:0
+ 178 p2: a(),
+ 179 p3: 1,
+ 180 ["p4"]: 1,
+ -> 181 # [b()]: 1,
+ 182 };
+ 183
+ => 184 |var a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+
+
+INSERTING AT: 182:0
+PAUSES AT: 184:0
+ 179 p3: 1,
+ 180 ["p4"]: 1,
+ 181 [b()]: 1,
+ -> 182 #};
+ 183
+ => 184 |var a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+
+
+INSERTING AT: 183:0
+PAUSES AT: 184:0
+ 180 ["p4"]: 1,
+ 181 [b()]: 1,
+ 182 };
+ -> 183 #
+ => 184 |var a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+
+
+INSERTING AT: 184:0
+PAUSES AT: 184:0
+ 181 [b()]: 1,
+ 182 };
+ 183
+-=> 184 |var a1 = [
+ 185 1,
+ 186 a(),
+ 187 1,
+
+
+INSERTING AT: 185:0
+PAUSES AT: 191:0
+ 182 };
+ 183
+ 184 var a1 = [
+ -> 185 # 1,
+ 186 a(),
+ 187 1,
+ 188 b(),
+ 189 ];
+ 190
+ => 191 |var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+
+
+INSERTING AT: 186:0
+PAUSES AT: 191:0
+ 183
+ 184 var a1 = [
+ 185 1,
+ -> 186 # a(),
+ 187 1,
+ 188 b(),
+ 189 ];
+ 190
+ => 191 |var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+
+
+INSERTING AT: 187:0
+PAUSES AT: 191:0
+ 184 var a1 = [
+ 185 1,
+ 186 a(),
+ -> 187 # 1,
+ 188 b(),
+ 189 ];
+ 190
+ => 191 |var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+
+
+INSERTING AT: 188:0
+PAUSES AT: 191:0
+ 185 1,
+ 186 a(),
+ 187 1,
+ -> 188 # b(),
+ 189 ];
+ 190
+ => 191 |var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+
+
+INSERTING AT: 189:0
+PAUSES AT: 191:0
+ 186 a(),
+ 187 1,
+ 188 b(),
+ -> 189 #];
+ 190
+ => 191 |var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+
+
+INSERTING AT: 190:0
+PAUSES AT: 191:0
+ 187 1,
+ 188 b(),
+ 189 ];
+ -> 190 #
+ => 191 |var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+
+
+INSERTING AT: 191:0
+PAUSES AT: 191:0
+ 188 b(),
+ 189 ];
+ 190
+-=> 191 |var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+
+
+INSERTING AT: 192:0
+PAUSES AT: 192:0
+ 189 ];
+ 190
+ 191 var i1 = new Base;
+-=> 192 |var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+ 195 i2.method();
+
+
+INSERTING AT: 193:0
+PAUSES AT: 193:0
+ 190
+ 191 var i1 = new Base;
+ 192 var i2 = new Child;
+-=> 193 |i2.name;
+ 194 i2.name = 1;
+ 195 i2.method();
+ 196
+
+
+INSERTING AT: 194:0
+PAUSES AT: 194:0
+ 191 var i1 = new Base;
+ 192 var i2 = new Child;
+ 193 i2.name;
+-=> 194 |i2.name = 1;
+ 195 i2.method();
+ 196
+ 197 var t1 = `${1} ${x=1} ${a()}`;
+
+
+INSERTING AT: 195:0
+PAUSES AT: 195:0
+ 192 var i2 = new Child;
+ 193 i2.name;
+ 194 i2.name = 1;
+-=> 195 |i2.method();
+ 196
+ 197 var t1 = `${1} ${x=1} ${a()}`;
+ 198 var t2 = a`${1} ${x=1} ${a()}`;
+
+
+INSERTING AT: 196:0
+PAUSES AT: 197:0
+ 193 i2.name;
+ 194 i2.name = 1;
+ 195 i2.method();
+ -> 196 #
+ => 197 |var t1 = `${1} ${x=1} ${a()}`;
+ 198 var t2 = a`${1} ${x=1} ${a()}`;
+ 199
+ 200 a(a(), b());
+
+
+INSERTING AT: 197:0
+PAUSES AT: 197:0
+ 194 i2.name = 1;
+ 195 i2.method();
+ 196
+-=> 197 |var t1 = `${1} ${x=1} ${a()}`;
+ 198 var t2 = a`${1} ${x=1} ${a()}`;
+ 199
+ 200 a(a(), b());
+
+
+INSERTING AT: 198:0
+PAUSES AT: 198:0
+ 195 i2.method();
+ 196
+ 197 var t1 = `${1} ${x=1} ${a()}`;
+-=> 198 |var t2 = a`${1} ${x=1} ${a()}`;
+ 199
+ 200 a(a(), b());
+ 201
+
+
+INSERTING AT: 199:0
+PAUSES AT: 200:0
+ 196
+ 197 var t1 = `${1} ${x=1} ${a()}`;
+ 198 var t2 = a`${1} ${x=1} ${a()}`;
+ -> 199 #
+ => 200 |a(a(), b());
+ 201
+
+
+INSERTING AT: 200:0
+PAUSES AT: 200:0
+ 197 var t1 = `${1} ${x=1} ${a()}`;
+ 198 var t2 = a`${1} ${x=1} ${a()}`;
+ 199
+-=> 200 |a(a(), b());
+ 201
+
+
+INSERTING AT: 201:0
+PRODUCES: Could not resolve breakpoint
+
+-- Running test case: Debugger.resolvedBreakpoint.dumpEachLine.Functions
+
+INSERTING AT: 0:0
+PAUSES AT: 0:19
+-=> 0 #function inline() {|}
+ 1 function named() {
+ 2 var x;
+ 3 }
+
+
+INSERTING AT: 1:0
+PAUSES AT: 2:4
+ 0 function inline() {}
+ -> 1 #function named() {
+ => 2 |var x;
+ 3 }
+ 4 function outer1() {
+ 5 function inner() {
+
+
+INSERTING AT: 2:0
+PAUSES AT: 2:4
+ 0 function inline() {}
+ 1 function named() {
+-=> 2 # |var x;
+ 3 }
+ 4 function outer1() {
+ 5 function inner() {
+
+
+INSERTING AT: 3:0
+PAUSES AT: 3:0
+ 0 function inline() {}
+ 1 function named() {
+ 2 var x;
+-=> 3 |}
+ 4 function outer1() {
+ 5 function inner() {
+ 6 var y;
+
+
+INSERTING AT: 4:0
+PAUSES AT: 8:0
+ 1 function named() {
+ 2 var x;
+ 3 }
+ -> 4 #function outer1() {
+ 5 function inner() {
+ 6 var y;
+ 7 }
+ => 8 |}
+ 9 function outer2()
+ 10 {
+ 11 function inner()
+
+
+INSERTING AT: 5:0
+PAUSES AT: 6:8
+ 2 var x;
+ 3 }
+ 4 function outer1() {
+ -> 5 # function inner() {
+ => 6 |var y;
+ 7 }
+ 8 }
+ 9 function outer2()
+
+
+INSERTING AT: 6:0
+PAUSES AT: 6:8
+ 3 }
+ 4 function outer1() {
+ 5 function inner() {
+-=> 6 # |var y;
+ 7 }
+ 8 }
+ 9 function outer2()
+
+
+INSERTING AT: 7:0
+PAUSES AT: 7:4
+ 4 function outer1() {
+ 5 function inner() {
+ 6 var y;
+-=> 7 # |}
+ 8 }
+ 9 function outer2()
+ 10 {
+
+
+INSERTING AT: 8:0
+PAUSES AT: 8:0
+ 5 function inner() {
+ 6 var y;
+ 7 }
+-=> 8 |}
+ 9 function outer2()
+ 10 {
+ 11 function inner()
+
+
+INSERTING AT: 9:0
+PAUSES AT: 15:0
+ 6 var y;
+ 7 }
+ 8 }
+ -> 9 #function outer2()
+ 10 {
+ 11 function inner()
+ 12 {
+ 13 var y;
+ 14 }
+ => 15 |}
+ 16 function outer3() {
+ 17 var x;
+ 18 function inner() { var y; }
+
+
+INSERTING AT: 10:0
+PAUSES AT: 15:0
+ 7 }
+ 8 }
+ 9 function outer2()
+ -> 10 #{
+ 11 function inner()
+ 12 {
+ 13 var y;
+ 14 }
+ => 15 |}
+ 16 function outer3() {
+ 17 var x;
+ 18 function inner() { var y; }
+
+
+INSERTING AT: 11:0
+PAUSES AT: 13:8
+ 8 }
+ 9 function outer2()
+ 10 {
+ -> 11 # function inner()
+ 12 {
+ => 13 |var y;
+ 14 }
+ 15 }
+ 16 function outer3() {
+
+
+INSERTING AT: 12:0
+PAUSES AT: 13:8
+ 9 function outer2()
+ 10 {
+ 11 function inner()
+ -> 12 # {
+ => 13 |var y;
+ 14 }
+ 15 }
+ 16 function outer3() {
+
+
+INSERTING AT: 13:0
+PAUSES AT: 13:8
+ 10 {
+ 11 function inner()
+ 12 {
+-=> 13 # |var y;
+ 14 }
+ 15 }
+ 16 function outer3() {
+
+
+INSERTING AT: 14:0
+PAUSES AT: 14:4
+ 11 function inner()
+ 12 {
+ 13 var y;
+-=> 14 # |}
+ 15 }
+ 16 function outer3() {
+ 17 var x;
+
+
+INSERTING AT: 15:0
+PAUSES AT: 15:0
+ 12 {
+ 13 var y;
+ 14 }
+-=> 15 |}
+ 16 function outer3() {
+ 17 var x;
+ 18 function inner() { var y; }
+
+
+INSERTING AT: 16:0
+PAUSES AT: 17:4
+ 13 var y;
+ 14 }
+ 15 }
+ -> 16 #function outer3() {
+ => 17 |var x;
+ 18 function inner() { var y; }
+ 19 }
+ 20 function outer4() {
+
+
+INSERTING AT: 17:0
+PAUSES AT: 17:4
+ 14 }
+ 15 }
+ 16 function outer3() {
+-=> 17 # |var x;
+ 18 function inner() { var y; }
+ 19 }
+ 20 function outer4() {
+
+
+INSERTING AT: 18:0
+PAUSES AT: 18:23
+ 15 }
+ 16 function outer3() {
+ 17 var x;
+-=> 18 # function inner() { |var y; }
+ 19 }
+ 20 function outer4() {
+ 21 function inner() { var y; }
+
+
+INSERTING AT: 19:0
+PAUSES AT: 19:0
+ 16 function outer3() {
+ 17 var x;
+ 18 function inner() { var y; }
+-=> 19 |}
+ 20 function outer4() {
+ 21 function inner() { var y; }
+ 22 var x;
+
+
+INSERTING AT: 20:0
+PAUSES AT: 22:4
+ 17 var x;
+ 18 function inner() { var y; }
+ 19 }
+ -> 20 #function outer4() {
+ 21 function inner() { var y; }
+ => 22 |var x;
+ 23 }
+ 24 function outer5() {
+ 25 var x;
+
+
+INSERTING AT: 21:0
+PAUSES AT: 21:23
+ 18 function inner() { var y; }
+ 19 }
+ 20 function outer4() {
+-=> 21 # function inner() { |var y; }
+ 22 var x;
+ 23 }
+ 24 function outer5() {
+
+
+INSERTING AT: 22:0
+PAUSES AT: 22:4
+ 19 }
+ 20 function outer4() {
+ 21 function inner() { var y; }
+-=> 22 # |var x;
+ 23 }
+ 24 function outer5() {
+ 25 var x;
+
+
+INSERTING AT: 23:0
+PAUSES AT: 23:0
+ 20 function outer4() {
+ 21 function inner() { var y; }
+ 22 var x;
+-=> 23 |}
+ 24 function outer5() {
+ 25 var x;
+ 26 function inner() { var y; }
+
+
+INSERTING AT: 24:0
+PAUSES AT: 25:4
+ 21 function inner() { var y; }
+ 22 var x;
+ 23 }
+ -> 24 #function outer5() {
+ => 25 |var x;
+ 26 function inner() { var y; }
+ 27 var x;
+ 28 }
+
+
+INSERTING AT: 25:0
+PAUSES AT: 25:4
+ 22 var x;
+ 23 }
+ 24 function outer5() {
+-=> 25 # |var x;
+ 26 function inner() { var y; }
+ 27 var x;
+ 28 }
+
+
+INSERTING AT: 26:0
+PAUSES AT: 26:23
+ 23 }
+ 24 function outer5() {
+ 25 var x;
+-=> 26 # function inner() { |var y; }
+ 27 var x;
+ 28 }
+ 29 function outer6() {
+
+
+INSERTING AT: 27:0
+PAUSES AT: 27:4
+ 24 function outer5() {
+ 25 var x;
+ 26 function inner() { var y; }
+-=> 27 # |var x;
+ 28 }
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+
+
+INSERTING AT: 28:0
+PAUSES AT: 28:0
+ 25 var x;
+ 26 function inner() { var y; }
+ 27 var x;
+-=> 28 |}
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+ 31 var x;
+
+
+INSERTING AT: 29:0
+PAUSES AT: 31:4
+ 26 function inner() { var y; }
+ 27 var x;
+ 28 }
+ -> 29 #function outer6() {
+ 30 function inner1() { var y; }
+ => 31 |var x;
+ 32 function inner2() { var z; }
+ 33 }
+ 34 function outer7() {
+
+
+INSERTING AT: 30:0
+PAUSES AT: 30:24
+ 27 var x;
+ 28 }
+ 29 function outer6() {
+-=> 30 # function inner1() { |var y; }
+ 31 var x;
+ 32 function inner2() { var z; }
+ 33 }
+
+
+INSERTING AT: 31:0
+PAUSES AT: 31:4
+ 28 }
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+-=> 31 # |var x;
+ 32 function inner2() { var z; }
+ 33 }
+ 34 function outer7() {
+
+
+INSERTING AT: 32:0
+PAUSES AT: 32:24
+ 29 function outer6() {
+ 30 function inner1() { var y; }
+ 31 var x;
+-=> 32 # function inner2() { |var z; }
+ 33 }
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+
+
+INSERTING AT: 33:0
+PAUSES AT: 33:0
+ 30 function inner1() { var y; }
+ 31 var x;
+ 32 function inner2() { var z; }
+-=> 33 |}
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+ 36 function inner2() { var z; }
+
+
+INSERTING AT: 34:0
+PAUSES AT: 37:4
+ 31 var x;
+ 32 function inner2() { var z; }
+ 33 }
+ -> 34 #function outer7() {
+ 35 function inner1() { var y; }
+ 36 function inner2() { var z; }
+ => 37 |var x;
+ 38 }
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+
+
+INSERTING AT: 35:0
+PAUSES AT: 35:24
+ 32 function inner2() { var z; }
+ 33 }
+ 34 function outer7() {
+-=> 35 # function inner1() { |var y; }
+ 36 function inner2() { var z; }
+ 37 var x;
+ 38 }
+
+
+INSERTING AT: 36:0
+PAUSES AT: 36:24
+ 33 }
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+-=> 36 # function inner2() { |var z; }
+ 37 var x;
+ 38 }
+ 39 function outer7() {
+
+
+INSERTING AT: 37:0
+PAUSES AT: 37:4
+ 34 function outer7() {
+ 35 function inner1() { var y; }
+ 36 function inner2() { var z; }
+-=> 37 # |var x;
+ 38 }
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+
+
+INSERTING AT: 38:0
+PAUSES AT: 38:0
+ 35 function inner1() { var y; }
+ 36 function inner2() { var z; }
+ 37 var x;
+-=> 38 |}
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+ 41 function inner2() { var z; }
+
+
+INSERTING AT: 39:0
+PAUSES AT: 42:0
+ 36 function inner2() { var z; }
+ 37 var x;
+ 38 }
+ -> 39 #function outer7() {
+ 40 function inner1() { var y; }
+ 41 function inner2() { var z; }
+ => 42 |}
+ 43
+ 44 (function() {
+ 45 var x;
+
+
+INSERTING AT: 40:0
+PAUSES AT: 40:24
+ 37 var x;
+ 38 }
+ 39 function outer7() {
+-=> 40 # function inner1() { |var y; }
+ 41 function inner2() { var z; }
+ 42 }
+ 43
+
+
+INSERTING AT: 41:0
+PAUSES AT: 41:24
+ 38 }
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+-=> 41 # function inner2() { |var z; }
+ 42 }
+ 43
+ 44 (function() {
+
+
+INSERTING AT: 42:0
+PAUSES AT: 42:0
+ 39 function outer7() {
+ 40 function inner1() { var y; }
+ 41 function inner2() { var z; }
+-=> 42 |}
+ 43
+ 44 (function() {
+ 45 var x;
+
+
+INSERTING AT: 43:0
+PAUSES AT: 44:0
+ 40 function inner1() { var y; }
+ 41 function inner2() { var z; }
+ 42 }
+ -> 43 #
+ => 44 |(function() {
+ 45 var x;
+ 46 })();
+ 47
+
+
+INSERTING AT: 44:0
+PAUSES AT: 44:0
+ 41 function inner2() { var z; }
+ 42 }
+ 43
+-=> 44 |(function() {
+ 45 var x;
+ 46 })();
+ 47
+
+
+INSERTING AT: 45:0
+PAUSES AT: 45:4
+ 42 }
+ 43
+ 44 (function() {
+-=> 45 # |var x;
+ 46 })();
+ 47
+ 48 (() => {
+
+
+INSERTING AT: 46:0
+PAUSES AT: 46:0
+ 43
+ 44 (function() {
+ 45 var x;
+-=> 46 |})();
+ 47
+ 48 (() => {
+ 49 var x;
+
+
+INSERTING AT: 47:0
+PAUSES AT: 48:0
+ 44 (function() {
+ 45 var x;
+ 46 })();
+ -> 47 #
+ => 48 |(() => {
+ 49 var x;
+ 50 });
+ 51
+
+
+INSERTING AT: 48:0
+PAUSES AT: 48:0
+ 45 var x;
+ 46 })();
+ 47
+-=> 48 |(() => {
+ 49 var x;
+ 50 });
+ 51
+
+
+INSERTING AT: 49:0
+PAUSES AT: 49:4
+ 46 })();
+ 47
+ 48 (() => {
+-=> 49 # |var x;
+ 50 });
+ 51
+ 52 function* generator() {
+
+
+INSERTING AT: 50:0
+PAUSES AT: 50:0
+ 47
+ 48 (() => {
+ 49 var x;
+-=> 50 |});
+ 51
+ 52 function* generator() {
+ 53 var x;
+
+
+INSERTING AT: 51:0
+PAUSES AT: 87:0
+ 48 (() => {
+ 49 var x;
+ 50 });
+ -> 51 #
+ 52 function* generator() {
+ 53 var x;
+ 54 }
+ 55
+ 56 class Class {
+ 57 static staticMethod1() {
+ 58 var x;
+ 59 }
+ 60 static staticMethod2()
+ 61 {
+ 62 var x;
+ 63 }
+ 64 method1() {
+ 65 var x;
+ 66 }
+ 67 method2()
+ 68 {
+ 69 var x;
+ 70 }
+ 71 get getter1() {
+ 72 var x;
+ 73 }
+ 74 get getter2()
+ 75 {
+ 76 var x;
+ 77 }
+ 78 set setter1(x) {
+ 79 var s;
+ 80 }
+ 81 set setter2(x)
+ 82 {
+ 83 var s;
+ 84 }
+ 85 }
+ 86
+ => 87 |x => x;
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+
+
+INSERTING AT: 52:0
+PAUSES AT: 53:4
+ 49 var x;
+ 50 });
+ 51
+ -> 52 #function* generator() {
+ => 53 |var x;
+ 54 }
+ 55
+ 56 class Class {
+
+
+INSERTING AT: 53:0
+PAUSES AT: 53:4
+ 50 });
+ 51
+ 52 function* generator() {
+-=> 53 # |var x;
+ 54 }
+ 55
+ 56 class Class {
+
+
+INSERTING AT: 54:0
+PAUSES AT: 54:0
+ 51
+ 52 function* generator() {
+ 53 var x;
+-=> 54 |}
+ 55
+ 56 class Class {
+ 57 static staticMethod1() {
+
+
+INSERTING AT: 55:0
+PAUSES AT: 87:0
+ 52 function* generator() {
+ 53 var x;
+ 54 }
+ -> 55 #
+ 56 class Class {
+ 57 static staticMethod1() {
+ 58 var x;
+ 59 }
+ 60 static staticMethod2()
+ 61 {
+ 62 var x;
+ 63 }
+ 64 method1() {
+ 65 var x;
+ 66 }
+ 67 method2()
+ 68 {
+ 69 var x;
+ 70 }
+ 71 get getter1() {
+ 72 var x;
+ 73 }
+ 74 get getter2()
+ 75 {
+ 76 var x;
+ 77 }
+ 78 set setter1(x) {
+ 79 var s;
+ 80 }
+ 81 set setter2(x)
+ 82 {
+ 83 var s;
+ 84 }
+ 85 }
+ 86
+ => 87 |x => x;
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+
+
+INSERTING AT: 56:0
+PAUSES AT: 87:0
+ 53 var x;
+ 54 }
+ 55
+ -> 56 #class Class {
+ 57 static staticMethod1() {
+ 58 var x;
+ 59 }
+ 60 static staticMethod2()
+ 61 {
+ 62 var x;
+ 63 }
+ 64 method1() {
+ 65 var x;
+ 66 }
+ 67 method2()
+ 68 {
+ 69 var x;
+ 70 }
+ 71 get getter1() {
+ 72 var x;
+ 73 }
+ 74 get getter2()
+ 75 {
+ 76 var x;
+ 77 }
+ 78 set setter1(x) {
+ 79 var s;
+ 80 }
+ 81 set setter2(x)
+ 82 {
+ 83 var s;
+ 84 }
+ 85 }
+ 86
+ => 87 |x => x;
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+
+
+INSERTING AT: 57:0
+PAUSES AT: 58:8
+ 54 }
+ 55
+ 56 class Class {
+ -> 57 # static staticMethod1() {
+ => 58 |var x;
+ 59 }
+ 60 static staticMethod2()
+ 61 {
+
+
+INSERTING AT: 58:0
+PAUSES AT: 58:8
+ 55
+ 56 class Class {
+ 57 static staticMethod1() {
+-=> 58 # |var x;
+ 59 }
+ 60 static staticMethod2()
+ 61 {
+
+
+INSERTING AT: 59:0
+PAUSES AT: 59:4
+ 56 class Class {
+ 57 static staticMethod1() {
+ 58 var x;
+-=> 59 # |}
+ 60 static staticMethod2()
+ 61 {
+ 62 var x;
+
+
+INSERTING AT: 60:0
+PAUSES AT: 62:8
+ 57 static staticMethod1() {
+ 58 var x;
+ 59 }
+ -> 60 # static staticMethod2()
+ 61 {
+ => 62 |var x;
+ 63 }
+ 64 method1() {
+ 65 var x;
+
+
+INSERTING AT: 61:0
+PAUSES AT: 62:8
+ 58 var x;
+ 59 }
+ 60 static staticMethod2()
+ -> 61 # {
+ => 62 |var x;
+ 63 }
+ 64 method1() {
+ 65 var x;
+
+
+INSERTING AT: 62:0
+PAUSES AT: 62:8
+ 59 }
+ 60 static staticMethod2()
+ 61 {
+-=> 62 # |var x;
+ 63 }
+ 64 method1() {
+ 65 var x;
+
+
+INSERTING AT: 63:0
+PAUSES AT: 63:4
+ 60 static staticMethod2()
+ 61 {
+ 62 var x;
+-=> 63 # |}
+ 64 method1() {
+ 65 var x;
+ 66 }
+
+
+INSERTING AT: 64:0
+PAUSES AT: 65:8
+ 61 {
+ 62 var x;
+ 63 }
+ -> 64 # method1() {
+ => 65 |var x;
+ 66 }
+ 67 method2()
+ 68 {
+
+
+INSERTING AT: 65:0
+PAUSES AT: 65:8
+ 62 var x;
+ 63 }
+ 64 method1() {
+-=> 65 # |var x;
+ 66 }
+ 67 method2()
+ 68 {
+
+
+INSERTING AT: 66:0
+PAUSES AT: 66:4
+ 63 }
+ 64 method1() {
+ 65 var x;
+-=> 66 # |}
+ 67 method2()
+ 68 {
+ 69 var x;
+
+
+INSERTING AT: 67:0
+PAUSES AT: 69:8
+ 64 method1() {
+ 65 var x;
+ 66 }
+ -> 67 # method2()
+ 68 {
+ => 69 |var x;
+ 70 }
+ 71 get getter1() {
+ 72 var x;
+
+
+INSERTING AT: 68:0
+PAUSES AT: 69:8
+ 65 var x;
+ 66 }
+ 67 method2()
+ -> 68 # {
+ => 69 |var x;
+ 70 }
+ 71 get getter1() {
+ 72 var x;
+
+
+INSERTING AT: 69:0
+PAUSES AT: 69:8
+ 66 }
+ 67 method2()
+ 68 {
+-=> 69 # |var x;
+ 70 }
+ 71 get getter1() {
+ 72 var x;
+
+
+INSERTING AT: 70:0
+PAUSES AT: 70:4
+ 67 method2()
+ 68 {
+ 69 var x;
+-=> 70 # |}
+ 71 get getter1() {
+ 72 var x;
+ 73 }
+
+
+INSERTING AT: 71:0
+PAUSES AT: 72:8
+ 68 {
+ 69 var x;
+ 70 }
+ -> 71 # get getter1() {
+ => 72 |var x;
+ 73 }
+ 74 get getter2()
+ 75 {
+
+
+INSERTING AT: 72:0
+PAUSES AT: 72:8
+ 69 var x;
+ 70 }
+ 71 get getter1() {
+-=> 72 # |var x;
+ 73 }
+ 74 get getter2()
+ 75 {
+
+
+INSERTING AT: 73:0
+PAUSES AT: 73:4
+ 70 }
+ 71 get getter1() {
+ 72 var x;
+-=> 73 # |}
+ 74 get getter2()
+ 75 {
+ 76 var x;
+
+
+INSERTING AT: 74:0
+PAUSES AT: 76:8
+ 71 get getter1() {
+ 72 var x;
+ 73 }
+ -> 74 # get getter2()
+ 75 {
+ => 76 |var x;
+ 77 }
+ 78 set setter1(x) {
+ 79 var s;
+
+
+INSERTING AT: 75:0
+PAUSES AT: 76:8
+ 72 var x;
+ 73 }
+ 74 get getter2()
+ -> 75 # {
+ => 76 |var x;
+ 77 }
+ 78 set setter1(x) {
+ 79 var s;
+
+
+INSERTING AT: 76:0
+PAUSES AT: 76:8
+ 73 }
+ 74 get getter2()
+ 75 {
+-=> 76 # |var x;
+ 77 }
+ 78 set setter1(x) {
+ 79 var s;
+
+
+INSERTING AT: 77:0
+PAUSES AT: 77:4
+ 74 get getter2()
+ 75 {
+ 76 var x;
+-=> 77 # |}
+ 78 set setter1(x) {
+ 79 var s;
+ 80 }
+
+
+INSERTING AT: 78:0
+PAUSES AT: 79:8
+ 75 {
+ 76 var x;
+ 77 }
+ -> 78 # set setter1(x) {
+ => 79 |var s;
+ 80 }
+ 81 set setter2(x)
+ 82 {
+
+
+INSERTING AT: 79:0
+PAUSES AT: 79:8
+ 76 var x;
+ 77 }
+ 78 set setter1(x) {
+-=> 79 # |var s;
+ 80 }
+ 81 set setter2(x)
+ 82 {
+
+
+INSERTING AT: 80:0
+PAUSES AT: 80:4
+ 77 }
+ 78 set setter1(x) {
+ 79 var s;
+-=> 80 # |}
+ 81 set setter2(x)
+ 82 {
+ 83 var s;
+
+
+INSERTING AT: 81:0
+PAUSES AT: 83:8
+ 78 set setter1(x) {
+ 79 var s;
+ 80 }
+ -> 81 # set setter2(x)
+ 82 {
+ => 83 |var s;
+ 84 }
+ 85 }
+ 86
+
+
+INSERTING AT: 82:0
+PAUSES AT: 83:8
+ 79 var s;
+ 80 }
+ 81 set setter2(x)
+ -> 82 # {
+ => 83 |var s;
+ 84 }
+ 85 }
+ 86
+
+
+INSERTING AT: 83:0
+PAUSES AT: 83:8
+ 80 }
+ 81 set setter2(x)
+ 82 {
+-=> 83 # |var s;
+ 84 }
+ 85 }
+ 86
+
+
+INSERTING AT: 84:0
+PAUSES AT: 84:4
+ 81 set setter2(x)
+ 82 {
+ 83 var s;
+-=> 84 # |}
+ 85 }
+ 86
+ 87 x => x;
+
+
+INSERTING AT: 85:0
+PAUSES AT: 87:0
+ 82 {
+ 83 var s;
+ 84 }
+ -> 85 #}
+ 86
+ => 87 |x => x;
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+
+
+INSERTING AT: 86:0
+PAUSES AT: 87:0
+ 83 var s;
+ 84 }
+ 85 }
+ -> 86 #
+ => 87 |x => x;
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+
+
+INSERTING AT: 87:0
+PAUSES AT: 87:0
+ 84 }
+ 85 }
+ 86
+-=> 87 |x => x;
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+
+
+INSERTING AT: 88:0
+PAUSES AT: 88:0
+ 85 }
+ 86
+ 87 x => x;
+-=> 88 |() => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+ 91 (x) => {
+
+
+INSERTING AT: 89:0
+PAUSES AT: 89:0
+ 86
+ 87 x => x;
+ 88 () => 1;
+-=> 89 |(x) => x;
+ 90 (x) => { x };
+ 91 (x) => {
+ 92 x
+
+
+INSERTING AT: 90:0
+PAUSES AT: 90:0
+ 87 x => x;
+ 88 () => 1;
+ 89 (x) => x;
+-=> 90 |(x) => { x };
+ 91 (x) => {
+ 92 x
+ 93 };
+
+
+INSERTING AT: 91:0
+PAUSES AT: 91:0
+ 88 () => 1;
+ 89 (x) => x;
+ 90 (x) => { x };
+-=> 91 |(x) => {
+ 92 x
+ 93 };
+ 94 () => {
+
+
+INSERTING AT: 92:0
+PAUSES AT: 92:4
+ 89 (x) => x;
+ 90 (x) => { x };
+ 91 (x) => {
+-=> 92 # |x
+ 93 };
+ 94 () => {
+ 95 var x;
+
+
+INSERTING AT: 93:0
+PAUSES AT: 93:0
+ 90 (x) => { x };
+ 91 (x) => {
+ 92 x
+-=> 93 |};
+ 94 () => {
+ 95 var x;
+ 96 };
+
+
+INSERTING AT: 94:0
+PAUSES AT: 94:0
+ 91 (x) => {
+ 92 x
+ 93 };
+-=> 94 |() => {
+ 95 var x;
+ 96 };
+ 97
+
+
+INSERTING AT: 95:0
+PAUSES AT: 95:4
+ 92 x
+ 93 };
+ 94 () => {
+-=> 95 # |var x;
+ 96 };
+ 97
+ 98 var fObj = {
+
+
+INSERTING AT: 96:0
+PAUSES AT: 96:0
+ 93 };
+ 94 () => {
+ 95 var x;
+-=> 96 |};
+ 97
+ 98 var fObj = {
+ 99 f1: function() {
+
+
+INSERTING AT: 97:0
+PAUSES AT: 98:0
+ 94 () => {
+ 95 var x;
+ 96 };
+ -> 97 #
+ => 98 |var fObj = {
+ 99 f1: function() {
+ 100 var x;
+ 101 },
+
+
+INSERTING AT: 98:0
+PAUSES AT: 98:0
+ 95 var x;
+ 96 };
+ 97
+-=> 98 |var fObj = {
+ 99 f1: function() {
+ 100 var x;
+ 101 },
+
+
+INSERTING AT: 99:0
+PAUSES AT: 100:8
+ 96 };
+ 97
+ 98 var fObj = {
+ -> 99 # f1: function() {
+ => 100 |var x;
+ 101 },
+ 102 f2: function()
+ 103 {
+
+
+INSERTING AT: 100:0
+PAUSES AT: 100:8
+ 97
+ 98 var fObj = {
+ 99 f1: function() {
+-=> 100 # |var x;
+ 101 },
+ 102 f2: function()
+ 103 {
+
+
+INSERTING AT: 101:0
+PAUSES AT: 101:4
+ 98 var fObj = {
+ 99 f1: function() {
+ 100 var x;
+-=> 101 # |},
+ 102 f2: function()
+ 103 {
+ 104 var x;
+
+
+INSERTING AT: 102:0
+PAUSES AT: 104:8
+ 99 f1: function() {
+ 100 var x;
+ 101 },
+ -> 102 # f2: function()
+ 103 {
+ => 104 |var x;
+ 105 },
+ 106 f3: () => {
+ 107 var x;
+
+
+INSERTING AT: 103:0
+PAUSES AT: 104:8
+ 100 var x;
+ 101 },
+ 102 f2: function()
+ -> 103 # {
+ => 104 |var x;
+ 105 },
+ 106 f3: () => {
+ 107 var x;
+
+
+INSERTING AT: 104:0
+PAUSES AT: 104:8
+ 101 },
+ 102 f2: function()
+ 103 {
+-=> 104 # |var x;
+ 105 },
+ 106 f3: () => {
+ 107 var x;
+
+
+INSERTING AT: 105:0
+PAUSES AT: 105:4
+ 102 f2: function()
+ 103 {
+ 104 var x;
+-=> 105 # |},
+ 106 f3: () => {
+ 107 var x;
+ 108 },
+
+
+INSERTING AT: 106:0
+PAUSES AT: 107:8
+ 103 {
+ 104 var x;
+ 105 },
+ -> 106 # f3: () => {
+ => 107 |var x;
+ 108 },
+ 109 f4: () =>
+ 110 {
+
+
+INSERTING AT: 107:0
+PAUSES AT: 107:8
+ 104 var x;
+ 105 },
+ 106 f3: () => {
+-=> 107 # |var x;
+ 108 },
+ 109 f4: () =>
+ 110 {
+
+
+INSERTING AT: 108:0
+PAUSES AT: 108:4
+ 105 },
+ 106 f3: () => {
+ 107 var x;
+-=> 108 # |},
+ 109 f4: () =>
+ 110 {
+ 111 var x;
+
+
+INSERTING AT: 109:0
+PAUSES AT: 111:8
+ 106 f3: () => {
+ 107 var x;
+ 108 },
+ -> 109 # f4: () =>
+ 110 {
+ => 111 |var x;
+ 112 }
+ 113 };
+ 114
+
+
+INSERTING AT: 110:0
+PAUSES AT: 111:8
+ 107 var x;
+ 108 },
+ 109 f4: () =>
+ -> 110 # {
+ => 111 |var x;
+ 112 }
+ 113 };
+ 114
+
+
+INSERTING AT: 111:0
+PAUSES AT: 111:8
+ 108 },
+ 109 f4: () =>
+ 110 {
+-=> 111 # |var x;
+ 112 }
+ 113 };
+ 114
+
+
+INSERTING AT: 112:0
+PAUSES AT: 112:4
+ 109 f4: () =>
+ 110 {
+ 111 var x;
+-=> 112 # |}
+ 113 };
+ 114
+
+
+INSERTING AT: 113:0
+PRODUCES: Could not resolve breakpoint
+
+INSERTING AT: 114:0
+PRODUCES: Could not resolve breakpoint
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointsresolveddumpeachlinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-each-line.html (0 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-each-line.html (rev 0)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-each-line.html 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../http/tests/inspector/resources/inspector-test.js"></script>
+<script src="../resources/log-pause-location.js"></script>
+<script src="resources/dump.js"></script>
+<script src="resources/dump-general.js"></script>
+<script src="resources/dump-functions.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("Debugger.resolvedBreakpoint.dumpEachLine");
+
+ window.addDumpEachLinePauseLocationTestCase(suite, {
+ name: "Debugger.resolvedBreakpoint.dumpEachLine.General",
+ scriptRegex: /dump-general\.js$/,
+ });
+
+ window.addDumpEachLinePauseLocationTestCase(suite, {
+ name: "Debugger.resolvedBreakpoint.dumpEachLine.Functions",
+ scriptRegex: /dump-functions\.js$/,
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Checking resolved breakpoint locations for each line in a script.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointsresourcesdumpfunctionsjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-functions.js (0 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-functions.js (rev 0)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-functions.js 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -0,0 +1,114 @@
</span><ins>+function inline() {}
+function named() {
+ var x;
+}
+function outer1() {
+ function inner() {
+ var y;
+ }
+}
+function outer2()
+{
+ function inner()
+ {
+ var y;
+ }
+}
+function outer3() {
+ var x;
+ function inner() { var y; }
+}
+function outer4() {
+ function inner() { var y; }
+ var x;
+}
+function outer5() {
+ var x;
+ function inner() { var y; }
+ var x;
+}
+function outer6() {
+ function inner1() { var y; }
+ var x;
+ function inner2() { var z; }
+}
+function outer7() {
+ function inner1() { var y; }
+ function inner2() { var z; }
+ var x;
+}
+function outer7() {
+ function inner1() { var y; }
+ function inner2() { var z; }
+}
+
+(function() {
+ var x;
+})();
+
+(() => {
+ var x;
+});
+
+function* generator() {
+ var x;
+}
+
+class Class {
+ static staticMethod1() {
+ var x;
+ }
+ static staticMethod2()
+ {
+ var x;
+ }
+ method1() {
+ var x;
+ }
+ method2()
+ {
+ var x;
+ }
+ get getter1() {
+ var x;
+ }
+ get getter2()
+ {
+ var x;
+ }
+ set setter1(x) {
+ var s;
+ }
+ set setter2(x)
+ {
+ var s;
+ }
+}
+
+x => x;
+() => 1;
+(x) => x;
+(x) => { x };
+(x) => {
+ x
+};
+() => {
+ var x;
+};
+
+var fObj = {
+ f1: function() {
+ var x;
+ },
+ f2: function()
+ {
+ var x;
+ },
+ f3: () => {
+ var x;
+ },
+ f4: () =>
+ {
+ var x;
+ }
+};
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointsresourcesdumpgeneraljs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-general.js (0 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-general.js (rev 0)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-general.js 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -0,0 +1,201 @@
</span><ins>+let a=function(){return 0}
+let b=function(){return 0}
+let c=function(){return 0}
+let arr=[];
+let obj={};
+
+// Control flow
+
+if (0)
+ a();
+
+if (0) {
+ a();
+}
+
+if (0)
+ a();
+else if (0)
+ a();
+else
+ a();
+
+a() ? b() : c()
+
+// Loops
+
+while (0)
+ a();
+
+while (0) {
+ a();
+}
+
+do {
+ a();
+} while (0);
+
+for (a(); b(); c())
+ break;
+
+for (; b(); c())
+ break;
+
+for (a(); b();)
+ break;
+
+for (a();; c())
+ break;
+
+for (a();;)
+ break;
+
+for (; b();)
+ break;
+
+for (;; c())
+ break;
+
+for (;;)
+ break;
+
+for (a(); b(); c()) {
+ break;
+}
+
+for (let x of arr)
+ break;
+
+for (let x in obj)
+ break;
+
+// Switch
+
+switch (0) {
+case 1:
+ a();
+ break;
+case 2:
+ a();
+ // fallthrough
+case 3:
+ a();
+ break;
+default:
+ a();
+ break;
+}
+
+// Try/Catch
+
+try {
+ a();
+} catch (e) {
+ shouldNotBeReached();
+} finally {
+ b();
+}
+
+// Class
+
+class Base {
+ constructor()
+ {
+ this._base = true;
+ }
+
+ baseMethod()
+ {
+ a();
+ }
+
+ method()
+ {
+ a();
+ }
+}
+
+class Child extends Base {
+ constructor()
+ {
+ super();
+ this._child = true;
+ }
+
+ childMethod()
+ {
+ b();
+ }
+
+ method()
+ {
+ super.method();
+ b();
+ }
+
+ get name()
+ {
+ return this._name;
+ }
+
+ set name(x)
+ {
+ this._name = x;
+ }
+}
+
+// ---------
+/* Misc */
+// ---------
+
+ {
+ a();
+ }
+
+label:
+ {
+ a();
+ }
+
+var w1 = {x:1, y:2};
+with (w1) {
+ a();
+}
+
+var v1 = 1,
+ v2 = 1;
+let l1 = 2,
+ l2 = 2;
+const c1 = 3,
+ c2 = 3;
+
+v1 = v2 = v1;
+
+var {x, y} = obj;
+var [w, z] = arr;
+
+var o1 = {
+ p1: 1,
+ p2: a(),
+ p3: 1,
+ ["p4"]: 1,
+ [b()]: 1,
+};
+
+var a1 = [
+ 1,
+ a(),
+ 1,
+ b(),
+];
+
+var i1 = new Base;
+var i2 = new Child;
+i2.name;
+i2.name = 1;
+i2.method();
+
+var t1 = `${1} ${x=1} ${a()}`;
+var t2 = a`${1} ${x=1} ${a()}`;
+
+a(a(), b());
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakpointsresourcesdumpjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump.js (0 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump.js (rev 0)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump.js 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+TestPage.registerInitializer(() => {
+ // Debugger.Location
+ function createLocation(script, lineNumber, columnNumber) {
+ return {scriptId: script.id, lineNumber, columnNumber};
+ }
+
+ // Dump all pause locations test.
+ // Tries to set a breakpoint at every line:column in the file and
+ // logs all unique pause locations with the originator line:column.
+ window.addDumpAllPauseLocationsTestCase = function(suite, {name, scriptRegex}) {
+ suite.addTestCase({
+ name, test(resolve, reject) {
+ let script = window.findScript(scriptRegex);
+ window.loadLinesFromSourceCode(script).then((lines) => {
+ // Iterate all possible pause locations in this file.
+ let pauseLocations = new Map;
+ let seenPauseLocations = new Set;
+
+ for (let line = script.range.startLine; line <= script.range.endLine; ++line) {
+ let max = lines[line].length;
+ for (let column = 0; column <= max; ++column) {
+ DebuggerAgent.setBreakpoint(createLocation(script, line, column), (error, breakpointId, location) => {
+ if (error)
+ return;
+ let key = JSON.stringify(location);
+ if (seenPauseLocations.has(key))
+ return;
+ pauseLocations.set({lineNumber: line, columnNumber: column}, location);
+ });
+ }
+ }
+
+ // Log the unique locations and the first input that produced it.
+ InspectorBackend.runAfterPendingDispatches(() => {
+ InspectorTest.log("");
+ for (let [inputLocation, payload] of pauseLocations) {
+ InspectorTest.log(`INSERTING AT: ${inputLocation.lineNumber}:${inputLocation.columnNumber}`);
+ InspectorTest.log(`PAUSES AT: ${payload.lineNumber}:${payload.columnNumber}`);
+ let resolvedLocation = script.createSourceCodeLocation(payload.lineNumber, payload.columnNumber);
+ window.logResolvedBreakpointLinesWithContext(inputLocation, resolvedLocation, 3);
+ InspectorTest.log("");
+ }
+ resolve();
+ });
+ });
+ }
+ });
+ }
+
+ // Dump each line test.
+ // Tries to set a breakpoint at every line:0 in the file and
+ // logs its pause location. Clears breakpoints before each line.
+ window.addDumpEachLinePauseLocationTestCase = function(suite, {name, scriptRegex}) {
+ suite.addTestCase({
+ name, test(resolve, reject) {
+ let script = window.findScript(scriptRegex);
+ window.loadLinesFromSourceCode(script).then(() => {
+ // Set one breakpoint per line.
+ for (let line = script.range.startLine; line <= script.range.endLine; ++line) {
+ DebuggerAgent.setBreakpoint(createLocation(script, line, 0), (error, breakpointId, payload) => {
+ InspectorTest.log("");
+ if (error) {
+ InspectorTest.log(`INSERTING AT: ${line}:0`);
+ InspectorTest.log(`PRODUCES: ${error}`);
+ } else {
+ let inputLocation = {lineNumber: line, columnNumber: 0};
+ let resolvedLocation = script.createSourceCodeLocation(payload.lineNumber, payload.columnNumber);
+ InspectorTest.log(`INSERTING AT: ${inputLocation.lineNumber}:${inputLocation.columnNumber}`);
+ InspectorTest.log(`PAUSES AT: ${payload.lineNumber}:${payload.columnNumber}`);
+ window.logResolvedBreakpointLinesWithContext(inputLocation, resolvedLocation, 3);
+ InspectorTest.log("");
+ }
+ });
+
+ // Clear the breakpoint we just set without knowing its breakpoint identifier.
+ DebuggerAgent.disable();
+ DebuggerAgent.enable();
+ }
+
+ // Resolve after all lines have been tried.
+ InspectorBackend.runAfterPendingDispatches(() => {
+ resolve();
+ });
+ });
+ }
+ });
+ }
+});
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerresourceslogpauselocationjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/resources/log-pause-location.js (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/resources/log-pause-location.js 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/LayoutTests/inspector/debugger/resources/log-pause-location.js 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> TestPage.registerInitializer(() => {
</span><span class="cx"> let lines = [];
</span><ins>+ let linesSourceCode = null;
</ins><span class="cx">
</span><span class="cx"> // Switch back to String.prototype.padStart once this is fixed:
</span><span class="cx"> // FIXME: <https://webkit.org/b/161944> stringProtoFuncRepeatCharacter will return `null` when it should not
</span><span class="lines">@@ -10,16 +11,82 @@
</span><span class="cx"> return " ".repeat(desired - length) + this;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- function insertCaretIntoStringAtIndex(str, index) {
- return str.slice(0, index) + "|" + str.slice(index);
</del><ins>+ function insertCaretIntoStringAtIndex(str, index, caret="|") {
+ return str.slice(0, index) + caret + str.slice(index);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function logLinesWithContext(location, context) {
- if (!WebInspector.frameResourceManager.mainFrame.mainResource.scripts.includes(location.sourceCode)) {
</del><ins>+ window.findScript = function(regex) {
+ let resources = WebInspector.frameResourceManager.mainFrame.resources;
+ for (let resource of resources) {
+ if (regex.test(resource.url))
+ return resource.scripts[0];
+ }
+ }
+
+ window.loadLinesFromSourceCode = function(sourceCode) {
+ linesSourceCode = sourceCode;
+ return sourceCode.requestContent()
+ .then((content) => {
+ lines = sourceCode.content.split(/\n/);
+ return lines;
+ })
+ .catch(() => {
+ InspectorTest.fail("Failed to load script content.");
+ InspectorTest.completeTest();
+ });
+ }
+
+ window.loadMainPageContent = function() {
+ return loadLinesFromSourceCode(WebInspector.frameResourceManager.mainFrame.mainResource);
+ }
+
+ window.logResolvedBreakpointLinesWithContext = function(inputLocation, resolvedLocation, context) {
+ if (resolvedLocation.sourceCode !== linesSourceCode && !WebInspector.frameResourceManager.mainFrame.mainResource.scripts.includes(resolvedLocation.sourceCode)) {
</ins><span class="cx"> InspectorTest.log("--- Source Unavailable ---");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ InspectorTest.assert(inputLocation.lineNumber <= resolvedLocation.lineNumber, "Input line number should always precede resolve location line number.");
+ InspectorTest.assert(inputLocation.lineNumber !== resolvedLocation.lineNumber || inputLocation.columnNumber <= resolvedLocation.columnNumber, "Input position should always precede resolve position.");
+
+ const inputCaret = "#";
+ const resolvedCaret = "|";
+
+ let startLine = inputLocation.lineNumber - context;
+ let endLine = resolvedLocation.lineNumber + context;
+ for (let lineNumber = startLine; lineNumber <= endLine; ++lineNumber) {
+ let lineContent = lines[lineNumber];
+ if (typeof lineContent !== "string")
+ continue;
+
+ let hasInputLocation = lineNumber === inputLocation.lineNumber;
+ let hasResolvedLocation = lineNumber === resolvedLocation.lineNumber;
+
+ let prefix = " ";
+ if (hasInputLocation && hasResolvedLocation) {
+ prefix = "-=> ";
+ lineContent = insertCaretIntoStringAtIndex(lineContent, resolvedLocation.columnNumber, resolvedCaret);
+ if (inputLocation.columnNumber !== resolvedLocation.columnNumber)
+ lineContent = insertCaretIntoStringAtIndex(lineContent, inputLocation.columnNumber, inputCaret);
+ } else if (hasInputLocation) {
+ prefix = " -> ";
+ lineContent = insertCaretIntoStringAtIndex(lineContent, inputLocation.columnNumber, inputCaret);
+ } else if (hasResolvedLocation) {
+ prefix = " => ";
+ lineContent = insertCaretIntoStringAtIndex(lineContent, resolvedLocation.columnNumber, resolvedCaret);
+ }
+
+ let number = lineNumber.toString().myPadStart(3);
+ InspectorTest.log(`${prefix}${number} ${lineContent}`);
+ }
+ }
+
+ window.logLinesWithContext = function(location, context) {
+ if (location.sourceCode !== linesSourceCode && !WebInspector.frameResourceManager.mainFrame.mainResource.scripts.includes(location.sourceCode)) {
+ InspectorTest.log("--- Source Unavailable ---");
+ return;
+ }
+
</ins><span class="cx"> let startLine = location.lineNumber - context;
</span><span class="cx"> let endLine = location.lineNumber + context;
</span><span class="cx"> for (let lineNumber = startLine; lineNumber <= endLine; ++lineNumber) {
</span><span class="lines">@@ -108,17 +175,6 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>-
- window.loadMainPageContent = function() {
- return WebInspector.frameResourceManager.mainFrame.mainResource.requestContent()
- .then((content) => {
- lines = WebInspector.frameResourceManager.mainFrame.mainResource.content.split(/\n/);
- })
- .catch(() => {
- InspectorTest.fail("Failed to load page content.");
- InspectorTest.completeTest();
- });
- }
</del><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if (!window.testRunner) {
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggersetBreakpointexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-expected.txt (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/setBreakpoint-expected.txt 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-expected.txt 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> Debugger.setBreakpoint on line:0 in <script src="...">
</span><span class="cx">
</span><span class="cx"> Found breakpoint.js
</span><del>-PASS: Received error setting duplicate breakpoint: Breakpoint at specified location already exists.
</del><ins>+PASS: Received error setting duplicate breakpoint: Breakpoint at specified location already exists
</ins><span class="cx"> Running breakpointBasic
</span><span class="cx"> inside breakpointBasic
</span><span class="cx"> Hit Breakpoint!
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSScriptRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSScriptRef.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> OpaqueJSScript(VM* vm, const String& url, int startingLineNumber, const String& source)
</span><del>- : SourceProvider(url, TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()))
</del><ins>+ : SourceProvider(url, TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()), SourceProviderSourceType::Program)
</ins><span class="cx"> , m_vm(vm)
</span><span class="cx"> , m_source(source.isNull() ? *StringImpl::empty() : *source.impl())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -248,6 +248,7 @@
</span><span class="cx"> debugger/Debugger.cpp
</span><span class="cx"> debugger/DebuggerCallFrame.cpp
</span><span class="cx"> debugger/DebuggerLocation.cpp
</span><ins>+ debugger/DebuggerParseData.cpp
</ins><span class="cx"> debugger/DebuggerScope.cpp
</span><span class="cx">
</span><span class="cx"> dfg/DFGAbstractHeap.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -1,5 +1,255 @@
</span><span class="cx"> 2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Breakpoints on blank lines or comments don't break
+ https://bugs.webkit.org/show_bug.cgi?id=9885
+ <rdar://problem/6134406>
+
+ Reviewed by Mark Lam.
+
+ This change introduces a way to perform a Debugger Parse of a script.
+ This debugger parse gathers a list of breakpoint locations, which
+ the backend uses to resolve breakpoint locations that came from the
+ Inspector frontend to the exact location we would actually pause.
+ We gather this information from the parser so that we can eagerly
+ get this information without requiring the code to have executed (the
+ real op_debugs are generated during bytecode generation when code
+ is actually evaluated).
+
+ If an input location was on a line with whitespace or a comment, the
+ resolved breakpoint location would be before the next statement that
+ will be executed. That may be the next line, or even later. We also
+ update our policy when setting breakpoints on and around function
+ statements to better match user expectations.
+
+ For example, when resolving breakpoints in:
+
+ 1. // Comment
+ 2. before;
+ 3.
+ 4. function foo() {
+ 5. inside;
+ 6. }
+ 7.
+ 8. after;
+
+ A breakpoint on line 1, a comment, resolves to line 2 the next
+ statement that will execute.
+
+ A breakpoint on line 3 or 7, empty lines, resolves to line 8 the next
+ statement that will execute. This skips past the definition of foo,
+ just like stepping would have done. The creation of foo would have
+ been hoisted, which would have happened before execution of the
+ other statements.
+
+ A breakpoint on line 4, a function signature, resolves to line 5,
+ inside the function. Users would expect to pause inside of a function
+ when setting a breakpoint on that function's name or opening brace.
+
+ A breakpoint on line 6, a function's closing brace, resolves to
+ line 6. The debugger will pause whenever execution leaves foo due to
+ a return and not an exception. This matches stepping behavior. An
+ explicit or implicit return (the implicit return undefined) will
+ pause on the closing brace as we leave the function, giving users
+ an opportunity to inspect the final state before leaving.
+
+ --
+
+ At this point, op_debug's are still emitted at custom locations during
+ bytecode generation of other statements / expressions. In order to
+ ensure the generated op_debugs correspond to locations the Parser
+ determined were breakpoint locations, the Parser sets a "needs debug
+ hook" flag on the nodes it will use for breakpoint locations, and
+ we assert during bytecode generation that op_debugs are only emitted
+ for nodes that were marked as needing debug hooks.
+
+ This still leaves open the possibility that the Parser will mark
+ some nodes that get missed during bytecode generation, so we might
+ fail to emit some op_debugs. The next step will be eliminating the
+ custom emitDebugHooks spread across StatementNode and ExpressionNode
+ subclasses, and instead always generating op_debugs whenever we
+ emit a flagged node.
+
+ --
+
+ * CMakeLists.txt:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ New DebuggerParseData files.
+
+ * API/JSScriptRef.cpp:
+ (OpaqueJSScript::OpaqueJSScript):
+ * jsc.cpp:
+ (functionCheckModuleSyntax):
+ * parser/SourceCode.h:
+ (JSC::makeSource):
+ * parser/SourceProvider.cpp:
+ (JSC::SourceProvider::SourceProvider):
+ * parser/SourceProvider.h:
+ (JSC::SourceProvider::sourceType):
+ (JSC::StringSourceProvider::create):
+ (JSC::StringSourceProvider::StringSourceProvider):
+ (JSC::WebAssemblySourceProvider::WebAssemblySourceProvider):
+ (JSC::SourceProvider::startPosition): Deleted.
+ Add a new type on SourceProvider to distinguish if its script was
+ intended to be a Script, Module, or WebAssembly. This information
+ will be needed to know how to best parse this file when the
+ debugger decides to lazily parse.
+
+ * runtime/Executable.cpp:
+ (JSC::EvalExecutable::EvalExecutable):
+ (JSC::ProgramExecutable::ProgramExecutable):
+ (JSC::ModuleProgramExecutable::ModuleProgramExecutable):
+ (JSC::WebAssemblyExecutable::WebAssemblyExecutable):
+ * runtime/ModuleLoaderPrototype.cpp:
+ (JSC::moduleLoaderPrototypeParseModule):
+ ASSERT the SourceProvider type matches the executable type we are
+ creating for it.
+
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::breakpointLocation):
+ * parser/SyntaxChecker.h:
+ (JSC::SyntaxChecker::operatorStackPop):
+ When gathering breakpoint positions, get the position from the
+ current node. In the SyntaxChecker, return an invalid position.
+
+ * parser/Nodes.h:
+ (JSC::ExpressionNode::needsDebugHook):
+ (JSC::ExpressionNode::setNeedsDebugHook):
+ (JSC::StatementNode::needsDebugHook):
+ (JSC::StatementNode::setNeedsDebugHook):
+ When gathering breakpoint positions, mark the node as needing
+ a debug hook. For now we assert op_debugs generated must come
+ from these nodes. Later we should just generate op_debugs for
+ these nodes.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::Parser):
+ (JSC::Parser<LexerType>::parseStatementListItem):
+ (JSC::Parser<LexerType>::parseDoWhileStatement):
+ (JSC::Parser<LexerType>::parseWhileStatement):
+ (JSC::Parser<LexerType>::parseArrowFunctionSingleExpressionBodySourceElements):
+ (JSC::Parser<LexerType>::parseForStatement):
+ (JSC::Parser<LexerType>::parseWithStatement):
+ (JSC::Parser<LexerType>::parseSwitchStatement):
+ (JSC::Parser<LexerType>::parseStatement):
+ (JSC::Parser<LexerType>::parseFunctionBody):
+ (JSC::Parser<LexerType>::parseFunctionInfo):
+ (JSC::Parser<LexerType>::parseIfStatement):
+ (JSC::Parser<LexerType>::parseAssignmentExpression):
+ * parser/Parser.h:
+ (JSC::parse):
+ Add an optional DebuggerParseData struct to the Parser. When available
+ the Parser will gather debugger data, and parse all functions with the
+ ASTBuilder instead of SyntaxChecking inner functions.
+
+ * debugger/DebuggerParseData.cpp: Added.
+ (JSC::DebuggerPausePositions::breakpointLocationForLineColumn):
+ (JSC::DebuggerPausePositions::sort):
+ (JSC::gatherDebuggerParseData):
+ (JSC::gatherDebuggerParseDataForSource):
+ * debugger/DebuggerParseData.h: Copied from Source/JavaScriptCore/debugger/DebuggerPrimitives.h.
+ (JSC::DebuggerPausePositions::DebuggerPausePositions):
+ (JSC::DebuggerPausePositions::appendPause):
+ (JSC::DebuggerPausePositions::appendEntry):
+ (JSC::DebuggerPausePositions::appendLeave):
+ The DebuggerParseData struct currently only contains a list of pause positions.
+ Once populated it can resolve an input location to a pause position.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitCall):
+ (JSC::BytecodeGenerator::emitCallVarargs):
+ (JSC::BytecodeGenerator::emitDebugHook):
+ (JSC::BytecodeGenerator::emitEnumeration):
+ * bytecompiler/BytecodeGenerator.h:
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::EmptyStatementNode::emitBytecode):
+ (JSC::DebuggerStatementNode::emitBytecode):
+ (JSC::ExprStatementNode::emitBytecode):
+ (JSC::DeclarationStatement::emitBytecode):
+ (JSC::IfElseNode::emitBytecode):
+ (JSC::DoWhileNode::emitBytecode):
+ (JSC::WhileNode::emitBytecode):
+ (JSC::ForNode::emitBytecode):
+ (JSC::ForInNode::emitBytecode):
+ (JSC::ContinueNode::emitBytecode):
+ (JSC::BreakNode::emitBytecode):
+ (JSC::ReturnNode::emitBytecode):
+ (JSC::WithNode::emitBytecode):
+ (JSC::SwitchNode::emitBytecode):
+ (JSC::ThrowNode::emitBytecode):
+ Emit op_debugs for the nodes themselves. Assert when we do that the
+ Parser had marked them as needing a debug hook.
+
+ * debugger/Breakpoint.h:
+ (JSC::Breakpoint::Breakpoint):
+ A breakpoint may be resolved or unresolved. Debugger::resolveBreakpoint
+ must be used to resolve the breakpoint. Most methods now require a
+ resolved breakpoint.
+
+ * debugger/Debugger.h:
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::detach):
+ (JSC::Debugger::toggleBreakpoint):
+ (JSC::Debugger::debuggerParseData):
+ (JSC::Debugger::resolveBreakpoint):
+ (JSC::Debugger::setBreakpoint):
+ (JSC::Debugger::clearParsedData):
+ Provide a public method to resolve a breakpoint location in a script.
+ This will gather debugger parse data for the script if none is available.
+ Ensure clients have resolved a breakpoint before attempting to set it.
+ Currently we allow only a single breakpoint at a location. This may
+ need to change if multiple breakpoints resolve to the same location
+ but have different actions.
+
+ * inspector/ScriptDebugListener.h:
+ ScriptDebugServer::Script is effectively duplicating most of the data from
+ a SourceProvider. We should eliminate this and just use SourceProvider.
+
+ * inspector/ScriptDebugServer.cpp:
+ (Inspector::ScriptDebugServer::setBreakpointActions):
+ (Inspector::ScriptDebugServer::removeBreakpointActions):
+ (Inspector::ScriptDebugServer::getActionsForBreakpoint):
+ (Inspector::ScriptDebugServer::clearBreakpointActions):
+ (Inspector::ScriptDebugServer::evaluateBreakpointAction):
+ (Inspector::ScriptDebugServer::dispatchDidParseSource):
+ (Inspector::ScriptDebugServer::handleBreakpointHit):
+ (Inspector::ScriptDebugServer::setBreakpoint): Deleted.
+ (Inspector::ScriptDebugServer::removeBreakpoint): Deleted.
+ (Inspector::ScriptDebugServer::clearBreakpoints): Deleted.
+ * inspector/ScriptDebugServer.h:
+ Reduce ScriptDebugServer's involvement in breakpoints to just handling
+ breakpoint actions. Eventually we should eliminate it alltogether and
+ fold breakpoint logic into Debugger or DebugAgent.
+
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::buildDebuggerLocation):
+ (Inspector::parseLocation):
+ (Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
+ (Inspector::InspectorDebuggerAgent::setBreakpoint):
+ (Inspector::InspectorDebuggerAgent::didSetBreakpoint):
+ (Inspector::InspectorDebuggerAgent::resolveBreakpoint):
+ (Inspector::InspectorDebuggerAgent::removeBreakpoint):
+ (Inspector::InspectorDebuggerAgent::continueToLocation):
+ (Inspector::InspectorDebuggerAgent::didParseSource):
+ (Inspector::InspectorDebuggerAgent::clearDebuggerBreakpointState):
+ The Inspector can set breakpoints in multiple ways.
+ Ensure that once we have the Script that we always
+ resolve the breakpoint location before setting the
+ breakpoint. The different paths are:
+
+ - setBreakpoint(scriptId, location)
+ - Here we know the SourceProvider by its SourceID
+ - resolve and set
+
+ - setBreakpointByURL(url, location)
+ - Search for existing Scripts that match the URL
+ - resolve in each and set
+ - When new Scripts are parsed that match the URL
+ - resolve and set
+
+
+2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Stepping out of a function finishes the line that called it.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155325
</span><span class="cx"> <rdar://problem/25094578>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -1657,6 +1657,8 @@
</span><span class="cx"> A59455921824744700CC3843 /* JSGlobalObjectDebuggable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A59455901824744700CC3843 /* JSGlobalObjectDebuggable.cpp */; };
</span><span class="cx"> A59455931824744700CC3843 /* JSGlobalObjectDebuggable.h in Headers */ = {isa = PBXBuildFile; fileRef = A59455911824744700CC3843 /* JSGlobalObjectDebuggable.h */; };
</span><span class="cx"> A5945595182479EB00CC3843 /* InspectorFrontendChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = A5945594182479EB00CC3843 /* InspectorFrontendChannel.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ A5A1A0941D8CB33E004C2EB8 /* DebuggerParseData.h in Headers */ = {isa = PBXBuildFile; fileRef = A5A1A0921D8CB12F004C2EB8 /* DebuggerParseData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A5A1A0951D8CB341004C2EB8 /* DebuggerParseData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5A1A0931D8CB337004C2EB8 /* DebuggerParseData.cpp */; };
</ins><span class="cx"> A5AB49DC1BEC8082007020FB /* PerGlobalObjectWrapperWorld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5AB49DA1BEC8079007020FB /* PerGlobalObjectWrapperWorld.cpp */; };
</span><span class="cx"> A5AB49DD1BEC8086007020FB /* PerGlobalObjectWrapperWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = A5AB49DB1BEC8079007020FB /* PerGlobalObjectWrapperWorld.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A5B6A74D18C6DBA600F11E91 /* ConsoleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5B6A74C18C6DBA600F11E91 /* ConsoleClient.cpp */; };
</span><span class="lines">@@ -3958,6 +3960,8 @@
</span><span class="cx"> A59455901824744700CC3843 /* JSGlobalObjectDebuggable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectDebuggable.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A59455911824744700CC3843 /* JSGlobalObjectDebuggable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGlobalObjectDebuggable.h; sourceTree = "<group>"; };
</span><span class="cx"> A5945594182479EB00CC3843 /* InspectorFrontendChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontendChannel.h; sourceTree = "<group>"; };
</span><ins>+ A5A1A0921D8CB12F004C2EB8 /* DebuggerParseData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebuggerParseData.h; sourceTree = "<group>"; };
+ A5A1A0931D8CB337004C2EB8 /* DebuggerParseData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DebuggerParseData.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> A5AB49DA1BEC8079007020FB /* PerGlobalObjectWrapperWorld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerGlobalObjectWrapperWorld.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A5AB49DB1BEC8079007020FB /* PerGlobalObjectWrapperWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerGlobalObjectWrapperWorld.h; sourceTree = "<group>"; };
</span><span class="cx"> A5B6A74C18C6DBA600F11E91 /* ConsoleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsoleClient.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5520,6 +5524,8 @@
</span><span class="cx"> 6AD2CB4C19B9140100065719 /* DebuggerEvalEnabler.h */,
</span><span class="cx"> A5FC84B01D1DDAC8006B5C46 /* DebuggerLocation.cpp */,
</span><span class="cx"> A5FC84B11D1DDAC8006B5C46 /* DebuggerLocation.h */,
</span><ins>+ A5A1A0931D8CB337004C2EB8 /* DebuggerParseData.cpp */,
+ A5A1A0921D8CB12F004C2EB8 /* DebuggerParseData.h */,
</ins><span class="cx"> FEA0861F182B7A0400F6D851 /* DebuggerPrimitives.h */,
</span><span class="cx"> 0F2D4DDB19832D34007D4B19 /* DebuggerScope.cpp */,
</span><span class="cx"> 0F2D4DDC19832D34007D4B19 /* DebuggerScope.h */,
</span><span class="lines">@@ -8322,6 +8328,7 @@
</span><span class="cx"> A7386556118697B400540279 /* ThunkGenerators.h in Headers */,
</span><span class="cx"> 141448CD13A1783700F5BA1A /* TinyBloomFilter.h in Headers */,
</span><span class="cx"> 2684D4381C00161C0081D663 /* AirLiveness.h in Headers */,
</span><ins>+ A5A1A0941D8CB33E004C2EB8 /* DebuggerParseData.h in Headers */,
</ins><span class="cx"> 0F55989817C86C5800A1E543 /* ToNativeFromValue.h in Headers */,
</span><span class="cx"> DCEE220B1CEB9895000C2396 /* DFGControlEquivalenceAnalysis.h in Headers */,
</span><span class="cx"> 0F2D4DE919832DAC007D4B19 /* ToThisStatus.h in Headers */,
</span><span class="lines">@@ -9509,6 +9516,7 @@
</span><span class="cx"> 148F21B0107EC5410042EC2C /* Lexer.cpp in Sources */,
</span><span class="cx"> 0FF4275715914A20004CB9FF /* LinkBuffer.cpp in Sources */,
</span><span class="cx"> A7E2EA6C0FB460CF00601F06 /* LiteralParser.cpp in Sources */,
</span><ins>+ A5A1A0951D8CB341004C2EB8 /* DebuggerParseData.cpp in Sources */,
</ins><span class="cx"> FE3913541B794F6E00EDAF71 /* LiveObjectList.cpp in Sources */,
</span><span class="cx"> FE20CE9D15F04A9500DF3430 /* LLIntCLoop.cpp in Sources */,
</span><span class="cx"> 0F4680D214BBD16500BFE272 /* LLIntData.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -3180,7 +3180,7 @@
</span><span class="cx"> callFrame.append(newTemporary());
</span><span class="cx">
</span><span class="cx"> if (m_shouldEmitDebugHooks && debuggableCall == DebuggableCall::Yes)
</span><del>- emitDebugHook(WillExecuteExpression, divotStart.line, divotStart.offset, divotStart.lineStartOffset);
</del><ins>+ emitDebugHook(WillExecuteExpression, divotStart);
</ins><span class="cx">
</span><span class="cx"> emitExpressionInfo(divot, divotStart, divotEnd);
</span><span class="cx">
</span><span class="lines">@@ -3234,7 +3234,7 @@
</span><span class="cx"> RegisterID* BytecodeGenerator::emitCallVarargs(OpcodeID opcode, RegisterID* dst, RegisterID* func, RegisterID* thisRegister, RegisterID* arguments, RegisterID* firstFreeRegister, int32_t firstVarArgOffset, const JSTextPosition& divot, const JSTextPosition& divotStart, const JSTextPosition& divotEnd, DebuggableCall debuggableCall)
</span><span class="cx"> {
</span><span class="cx"> if (m_shouldEmitDebugHooks && debuggableCall == DebuggableCall::Yes)
</span><del>- emitDebugHook(WillExecuteExpression, divotStart.line, divotStart.offset, divotStart.lineStartOffset);
</del><ins>+ emitDebugHook(WillExecuteExpression, divotStart);
</ins><span class="cx">
</span><span class="cx"> emitExpressionInfo(divot, divotStart, divotEnd);
</span><span class="cx">
</span><span class="lines">@@ -3459,12 +3459,11 @@
</span><span class="cx"> RELEASE_ASSERT(stackEntry.m_isWithScope);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BytecodeGenerator::emitDebugHook(DebugHookID debugHookID, unsigned line, unsigned charOffset, unsigned lineStart)
</del><ins>+void BytecodeGenerator::emitDebugHook(DebugHookID debugHookID, const JSTextPosition& divot)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_shouldEmitDebugHooks)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- JSTextPosition divot(line, charOffset, lineStart);
</del><span class="cx"> emitExpressionInfo(divot, divot, divot);
</span><span class="cx"> emitOpcode(op_debug);
</span><span class="cx"> instructions().append(debugHookID);
</span><span class="lines">@@ -3471,6 +3470,23 @@
</span><span class="cx"> instructions().append(false);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void BytecodeGenerator::emitDebugHook(DebugHookID debugHookID, unsigned line, unsigned charOffset, unsigned lineStart)
+{
+ emitDebugHook(debugHookID, JSTextPosition(line, charOffset, lineStart));
+}
+
+void BytecodeGenerator::emitDebugHook(StatementNode* statement)
+{
+ RELEASE_ASSERT(statement->needsDebugHook());
+ emitDebugHook(WillExecuteStatement, statement->position());
+}
+
+void BytecodeGenerator::emitDebugHook(ExpressionNode* expr, DebugHookID debugHookID)
+{
+ RELEASE_ASSERT(expr->needsDebugHook());
+ emitDebugHook(debugHookID, expr->position());
+}
+
</ins><span class="cx"> void BytecodeGenerator::emitWillLeaveCallFrameDebugHook()
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(m_scopeNode->isFunctionNode());
</span><span class="lines">@@ -4134,7 +4150,7 @@
</span><span class="cx"> if (forLoopNode) {
</span><span class="cx"> RELEASE_ASSERT(forLoopNode->isForOfNode());
</span><span class="cx"> prepareLexicalScopeForNextForLoopIteration(forLoopNode, forLoopSymbolTable);
</span><del>- emitDebugHook(WillExecuteStatement, forLoopNode->expr()->firstLine(), forLoopNode->expr()->startOffset(), forLoopNode->expr()->lineStartOffset());
</del><ins>+ emitDebugHook(forLoopNode->expr(), WillExecuteStatement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -676,7 +676,10 @@
</span><span class="cx"> void emitPutDerivedConstructorToArrowFunctionContextScope();
</span><span class="cx"> RegisterID* emitLoadDerivedConstructorFromArrowFunctionLexicalEnvironment();
</span><span class="cx">
</span><ins>+ void emitDebugHook(DebugHookID, const JSTextPosition&);
</ins><span class="cx"> void emitDebugHook(DebugHookID, unsigned line, unsigned charOffset, unsigned lineStart);
</span><ins>+ void emitDebugHook(StatementNode*);
+ void emitDebugHook(ExpressionNode*, DebugHookID);
</ins><span class="cx"> void emitWillLeaveCallFrameDebugHook();
</span><span class="cx">
</span><span class="cx"> bool isInFinallyBlock() { return m_finallyDepth > 0; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -2341,7 +2341,7 @@
</span><span class="cx">
</span><span class="cx"> void EmptyStatementNode::emitBytecode(BytecodeGenerator& generator, RegisterID*)
</span><span class="cx"> {
</span><del>- generator.emitDebugHook(WillExecuteStatement, firstLine(), startOffset(), lineStartOffset());
</del><ins>+ generator.emitDebugHook(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ------------------------------ DebuggerStatementNode ---------------------------
</span><span class="lines">@@ -2348,7 +2348,7 @@
</span><span class="cx">
</span><span class="cx"> void DebuggerStatementNode::emitBytecode(BytecodeGenerator& generator, RegisterID*)
</span><span class="cx"> {
</span><del>- generator.emitDebugHook(DidReachBreakpoint, lastLine(), startOffset(), lineStartOffset());
</del><ins>+ generator.emitDebugHook(DidReachBreakpoint, position());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ------------------------------ ExprStatementNode ----------------------------
</span><span class="lines">@@ -2356,7 +2356,7 @@
</span><span class="cx"> void ExprStatementNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_expr);
</span><del>- generator.emitDebugHook(WillExecuteStatement, firstLine(), startOffset(), lineStartOffset());
</del><ins>+ generator.emitDebugHook(this);
</ins><span class="cx"> generator.emitNode(dst, m_expr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2365,7 +2365,7 @@
</span><span class="cx"> void DeclarationStatement::emitBytecode(BytecodeGenerator& generator, RegisterID*)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_expr);
</span><del>- generator.emitDebugHook(WillExecuteStatement, firstLine(), startOffset(), lineStartOffset());
</del><ins>+ generator.emitDebugHook(this);
</ins><span class="cx"> generator.emitNode(m_expr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2453,7 +2453,7 @@
</span><span class="cx">
</span><span class="cx"> void IfElseNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_condition->firstLine(), m_condition->startOffset(), m_condition->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_condition, WillExecuteStatement);
</ins><span class="cx">
</span><span class="cx"> RefPtr<Label> beforeThen = generator.newLabel();
</span><span class="cx"> RefPtr<Label> beforeElse = generator.newLabel();
</span><span class="lines">@@ -2499,7 +2499,7 @@
</span><span class="cx"> generator.emitNodeInTailPosition(dst, m_statement);
</span><span class="cx">
</span><span class="cx"> generator.emitLabel(scope->continueTarget());
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr, WillExecuteStatement);
</ins><span class="cx"> generator.emitNodeInConditionContext(m_expr, topOfLoop.get(), scope->breakTarget(), FallThroughMeansFalse);
</span><span class="cx">
</span><span class="cx"> generator.emitLabel(scope->breakTarget());
</span><span class="lines">@@ -2512,7 +2512,7 @@
</span><span class="cx"> LabelScopePtr scope = generator.newLabelScope(LabelScope::Loop);
</span><span class="cx"> RefPtr<Label> topOfLoop = generator.newLabel();
</span><span class="cx">
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr, WillExecuteStatement);
</ins><span class="cx"> generator.emitNodeInConditionContext(m_expr, topOfLoop.get(), scope->breakTarget(), FallThroughMeansTrue);
</span><span class="cx">
</span><span class="cx"> generator.emitLabel(topOfLoop.get());
</span><span class="lines">@@ -2522,7 +2522,7 @@
</span><span class="cx"> generator.emitNodeInTailPosition(dst, m_statement);
</span><span class="cx">
</span><span class="cx"> generator.emitLabel(scope->continueTarget());
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr, WillExecuteStatement);
</ins><span class="cx">
</span><span class="cx"> generator.emitNodeInConditionContext(m_expr, topOfLoop.get(), scope->breakTarget(), FallThroughMeansFalse);
</span><span class="cx">
</span><span class="lines">@@ -2542,17 +2542,17 @@
</span><span class="cx">
</span><span class="cx"> if (m_expr1 || m_expr2) {
</span><span class="cx"> ExpressionNode* firstExpr = m_expr1 ? m_expr1 : m_expr2;
</span><del>- generator.emitDebugHook(WillExecuteStatement, firstExpr->firstLine(), firstExpr->startOffset(), firstExpr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(firstExpr, WillExecuteStatement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_expr1) {
</span><del>- generator.emitDebugHook(WillExecuteExpression, m_expr1->firstLine(), m_expr1->startOffset(), m_expr1->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr1, WillExecuteExpression);
</ins><span class="cx"> generator.emitNode(generator.ignoredResult(), m_expr1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Label> topOfLoop = generator.newLabel();
</span><span class="cx"> if (m_expr2) {
</span><del>- generator.emitDebugHook(WillExecuteExpression, m_expr2->firstLine(), m_expr2->startOffset(), m_expr2->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr2, WillExecuteExpression);
</ins><span class="cx"> generator.emitNodeInConditionContext(m_expr2, topOfLoop.get(), scope->breakTarget(), FallThroughMeansTrue);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2565,12 +2565,12 @@
</span><span class="cx"> generator.emitLabel(scope->continueTarget());
</span><span class="cx"> generator.prepareLexicalScopeForNextForLoopIteration(this, forLoopSymbolTable);
</span><span class="cx"> if (m_expr3) {
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr3->firstLine(), m_expr3->startOffset(), m_expr3->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr3, WillExecuteStatement);
</ins><span class="cx"> generator.emitNode(generator.ignoredResult(), m_expr3);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_expr2) {
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr2->firstLine(), m_expr2->startOffset(), m_expr2->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr2, WillExecuteStatement);
</ins><span class="cx"> generator.emitNodeInConditionContext(m_expr2, topOfLoop.get(), scope->breakTarget(), FallThroughMeansFalse);
</span><span class="cx"> } else
</span><span class="cx"> generator.emitJump(topOfLoop.get());
</span><span class="lines">@@ -2701,7 +2701,7 @@
</span><span class="cx"> RegisterID* forLoopSymbolTable = nullptr;
</span><span class="cx"> generator.pushLexicalScope(this, BytecodeGenerator::TDZCheckOptimization::Optimize, BytecodeGenerator::NestedScopeType::IsNested, &forLoopSymbolTable);
</span><span class="cx">
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr, WillExecuteStatement);
</ins><span class="cx">
</span><span class="cx"> if (m_lexpr->isAssignResolveNode())
</span><span class="cx"> generator.emitNode(generator.ignoredResult(), m_lexpr);
</span><span class="lines">@@ -2751,7 +2751,7 @@
</span><span class="cx"> generator.emitLabel(scope->continueTarget());
</span><span class="cx"> generator.prepareLexicalScopeForNextForLoopIteration(this, forLoopSymbolTable);
</span><span class="cx"> generator.emitInc(i.get());
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr, WillExecuteStatement);
</ins><span class="cx"> generator.emitJump(loopStart.get());
</span><span class="cx">
</span><span class="cx"> generator.emitLabel(scope->breakTarget());
</span><span class="lines">@@ -2791,7 +2791,7 @@
</span><span class="cx"> generator.prepareLexicalScopeForNextForLoopIteration(this, forLoopSymbolTable);
</span><span class="cx"> generator.emitInc(enumeratorIndex.get());
</span><span class="cx"> generator.emitEnumeratorStructurePropertyName(propertyName.get(), enumerator.get(), enumeratorIndex.get());
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr, WillExecuteStatement);
</ins><span class="cx"> generator.emitJump(loopStart.get());
</span><span class="cx">
</span><span class="cx"> generator.emitLabel(scope->breakTarget());
</span><span class="lines">@@ -2828,7 +2828,7 @@
</span><span class="cx"> generator.prepareLexicalScopeForNextForLoopIteration(this, forLoopSymbolTable);
</span><span class="cx"> generator.emitInc(enumeratorIndex.get());
</span><span class="cx"> generator.emitEnumeratorGenericPropertyName(propertyName.get(), enumerator.get(), enumeratorIndex.get());
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr, WillExecuteStatement);
</ins><span class="cx"> generator.emitJump(loopStart.get());
</span><span class="cx">
</span><span class="cx"> generator.emitLabel(scope->breakTarget());
</span><span class="lines">@@ -2925,7 +2925,7 @@
</span><span class="cx">
</span><span class="cx"> void ContinueNode::emitBytecode(BytecodeGenerator& generator, RegisterID*)
</span><span class="cx"> {
</span><del>- generator.emitDebugHook(WillExecuteStatement, firstLine(), startOffset(), lineStartOffset());
</del><ins>+ generator.emitDebugHook(this);
</ins><span class="cx">
</span><span class="cx"> LabelScopePtr scope = generator.continueTarget(m_ident);
</span><span class="cx"> ASSERT(scope);
</span><span class="lines">@@ -2954,7 +2954,7 @@
</span><span class="cx">
</span><span class="cx"> void BreakNode::emitBytecode(BytecodeGenerator& generator, RegisterID*)
</span><span class="cx"> {
</span><del>- generator.emitDebugHook(WillExecuteStatement, firstLine(), startOffset(), lineStartOffset());
</del><ins>+ generator.emitDebugHook(this);
</ins><span class="cx">
</span><span class="cx"> LabelScopePtr scope = generator.breakTarget(m_ident);
</span><span class="cx"> ASSERT(scope);
</span><span class="lines">@@ -2969,7 +2969,8 @@
</span><span class="cx">
</span><span class="cx"> void ReturnNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><del>- generator.emitDebugHook(WillExecuteStatement, firstLine(), startOffset(), lineStartOffset());
</del><ins>+ generator.emitDebugHook(this);
+
</ins><span class="cx"> ASSERT(generator.codeType() == FunctionCode);
</span><span class="cx">
</span><span class="cx"> if (dst == generator.ignoredResult())
</span><span class="lines">@@ -2996,7 +2997,7 @@
</span><span class="cx">
</span><span class="cx"> void WithNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr, WillExecuteStatement);
</ins><span class="cx">
</span><span class="cx"> RefPtr<RegisterID> scope = generator.emitNode(m_expr);
</span><span class="cx"> generator.emitExpressionInfo(m_divot, m_divot - m_expressionLength, m_divot);
</span><span class="lines">@@ -3171,7 +3172,7 @@
</span><span class="cx">
</span><span class="cx"> void SwitchNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><del>- generator.emitDebugHook(WillExecuteStatement, m_expr->firstLine(), m_expr->startOffset(), m_expr->lineStartOffset());
</del><ins>+ generator.emitDebugHook(m_expr, WillExecuteStatement);
</ins><span class="cx">
</span><span class="cx"> LabelScopePtr scope = generator.newLabelScope(LabelScope::Switch);
</span><span class="cx">
</span><span class="lines">@@ -3201,7 +3202,7 @@
</span><span class="cx">
</span><span class="cx"> void ThrowNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><del>- generator.emitDebugHook(WillExecuteStatement, firstLine(), startOffset(), lineStartOffset());
</del><ins>+ generator.emitDebugHook(this);
</ins><span class="cx">
</span><span class="cx"> if (dst == generator.ignoredResult())
</span><span class="cx"> dst = 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerBreakpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Breakpoint.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Breakpoint.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/debugger/Breakpoint.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> , autoContinue(other.autoContinue)
</span><span class="cx"> , ignoreCount(other.ignoreCount)
</span><span class="cx"> , hitCount(other.hitCount)
</span><ins>+ , resolved(other.resolved)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx"> bool autoContinue { false };
</span><span class="cx"> unsigned ignoreCount { 0 };
</span><span class="cx"> unsigned hitCount { 0 };
</span><ins>+ bool resolved { false };
</ins><span class="cx">
</span><span class="cx"> static const unsigned unspecifiedColumn = UINT_MAX;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> #include "Error.h"
</span><span class="cx"> #include "HeapIterationScope.h"
</span><span class="cx"> #include "Interpreter.h"
</span><ins>+#include "JSCInlines.h"
</ins><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><del>-#include "JSCInlines.h"
</del><span class="cx"> #include "MarkedSpaceInlines.h"
</span><span class="cx"> #include "Parser.h"
</span><span class="cx"> #include "Protect.h"
</span><span class="lines">@@ -183,6 +183,9 @@
</span><span class="cx"> clearDebuggerRequests(globalObject);
</span><span class="cx">
</span><span class="cx"> globalObject->setDebugger(nullptr);
</span><ins>+
+ if (m_globalObjects.isEmpty())
+ clearParsedData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Debugger::isAttached(JSGlobalObject* globalObject)
</span><span class="lines">@@ -251,6 +254,8 @@
</span><span class="cx">
</span><span class="cx"> void Debugger::toggleBreakpoint(CodeBlock* codeBlock, Breakpoint& breakpoint, BreakpointState enabledOrNot)
</span><span class="cx"> {
</span><ins>+ ASSERT(breakpoint.resolved);
+
</ins><span class="cx"> ScriptExecutable* executable = codeBlock->ownerScriptExecutable();
</span><span class="cx">
</span><span class="cx"> SourceID sourceID = static_cast<SourceID>(executable->sourceID());
</span><span class="lines">@@ -278,6 +283,7 @@
</span><span class="cx"> if (line == endLine && column > endColumn)
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (!codeBlock->hasOpDebugForLineAndColumn(line, column))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -331,15 +337,55 @@
</span><span class="cx"> m_vm.deleteAllCode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-BreakpointID Debugger::setBreakpoint(Breakpoint breakpoint, unsigned& actualLine, unsigned& actualColumn)
</del><ins>+DebuggerParseData& Debugger::debuggerParseData(SourceID sourceID, SourceProvider* provider)
</ins><span class="cx"> {
</span><ins>+ auto iter = m_parseDataMap.find(sourceID);
+ if (iter != m_parseDataMap.end())
+ return iter->value;
+
+ DebuggerParseData parseData;
+ gatherDebuggerParseDataForSource(m_vm, provider, parseData);
+ auto result = m_parseDataMap.add(sourceID, parseData);
+ return result.iterator->value;
+}
+
+void Debugger::resolveBreakpoint(Breakpoint& breakpoint, SourceProvider* sourceProvider)
+{
+ RELEASE_ASSERT(!breakpoint.resolved);
+ ASSERT(breakpoint.sourceID != noSourceID);
+
+ // FIXME: <https://webkit.org/b/162771> Web Inspector: Adopt TextPosition in Inspector to avoid oneBasedInt/zeroBasedInt ambiguity
+ // Inspector breakpoint line and column values are zero-based but the executable
+ // and CodeBlock line and column values are one-based.
+ unsigned line = breakpoint.line + 1;
+ unsigned column = breakpoint.column ? breakpoint.column : Breakpoint::unspecifiedColumn;
+
+ DebuggerParseData& parseData = debuggerParseData(breakpoint.sourceID, sourceProvider);
+ Optional<JSTextPosition> resolvedPosition = parseData.pausePositions.breakpointLocationForLineColumn((int)line, (int)column);
+ if (!resolvedPosition)
+ return;
+
+ unsigned resolvedLine = resolvedPosition->line;
+ unsigned resolvedColumn = resolvedPosition->offset - resolvedPosition->lineStartOffset + 1;
+
+ breakpoint.line = resolvedLine - 1;
+ breakpoint.column = resolvedColumn - 1;
+ breakpoint.resolved = true;
+}
+
+BreakpointID Debugger::setBreakpoint(Breakpoint& breakpoint, bool& existing)
+{
+ ASSERT(breakpoint.resolved);
+ ASSERT(breakpoint.sourceID != noSourceID);
+
</ins><span class="cx"> SourceID sourceID = breakpoint.sourceID;
</span><span class="cx"> unsigned line = breakpoint.line;
</span><span class="cx"> unsigned column = breakpoint.column;
</span><span class="cx">
</span><del>- SourceIDToBreakpointsMap::iterator it = m_sourceIDToBreakpoints.find(sourceID);
</del><ins>+ SourceIDToBreakpointsMap::iterator it = m_sourceIDToBreakpoints.find(breakpoint.sourceID);
</ins><span class="cx"> if (it == m_sourceIDToBreakpoints.end())
</span><span class="cx"> it = m_sourceIDToBreakpoints.set(sourceID, LineToBreakpointsMap()).iterator;
</span><ins>+
</ins><span class="cx"> LineToBreakpointsMap::iterator breaksIt = it->value.find(line);
</span><span class="cx"> if (breaksIt == it->value.end())
</span><span class="cx"> breaksIt = it->value.set(line, adoptRef(new BreakpointsList)).iterator;
</span><span class="lines">@@ -347,26 +393,23 @@
</span><span class="cx"> BreakpointsList& breakpoints = *breaksIt->value;
</span><span class="cx"> for (Breakpoint* current = breakpoints.head(); current; current = current->next()) {
</span><span class="cx"> if (current->column == column) {
</span><del>- // The breakpoint already exists. We're not allowed to create a new
- // breakpoint at this location. Rather than returning the breakpointID
- // of the pre-existing breakpoint, we need to return noBreakpointID
- // to indicate that we're not creating a new one.
- return noBreakpointID;
</del><ins>+ // Found existing breakpoint. Do not create a duplicate at this location.
+ existing = true;
+ return current->id;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ existing = false;
</ins><span class="cx"> BreakpointID id = ++m_topBreakpointID;
</span><span class="cx"> RELEASE_ASSERT(id != noBreakpointID);
</span><span class="cx">
</span><span class="cx"> breakpoint.id = id;
</span><del>- actualLine = line;
- actualColumn = column;
</del><span class="cx">
</span><span class="cx"> Breakpoint* newBreakpoint = new Breakpoint(breakpoint);
</span><span class="cx"> breakpoints.append(newBreakpoint);
</span><span class="cx"> m_breakpointIDToBreakpoint.set(id, newBreakpoint);
</span><span class="cx">
</span><del>- toggleBreakpoint(breakpoint, BreakpointEnabled);
</del><ins>+ toggleBreakpoint(*newBreakpoint, BreakpointEnabled);
</ins><span class="cx">
</span><span class="cx"> return id;
</span><span class="cx"> }
</span><span class="lines">@@ -420,7 +463,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned line = position.m_line.zeroBasedInt();
</span><span class="cx"> unsigned column = position.m_column.zeroBasedInt();
</span><del>-
</del><ins>+
</ins><span class="cx"> LineToBreakpointsMap::const_iterator breaksIt = it->value.find(line);
</span><span class="cx"> if (breaksIt == it->value.end())
</span><span class="cx"> return false;
</span><span class="lines">@@ -530,6 +573,11 @@
</span><span class="cx"> m_vm.heap.forEachCodeBlock(functor);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Debugger::clearParsedData()
+{
+ m_parseDataMap.clear();
+}
+
</ins><span class="cx"> void Debugger::setBreakpointsActivated(bool activated)
</span><span class="cx"> {
</span><span class="cx"> if (activated == m_breakpointsActivated)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "Breakpoint.h"
</span><span class="cx"> #include "CallData.h"
</span><span class="cx"> #include "DebuggerCallFrame.h"
</span><ins>+#include "DebuggerParseData.h"
</ins><span class="cx"> #include "DebuggerPrimitives.h"
</span><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -72,9 +73,11 @@
</span><span class="cx"> void detach(JSGlobalObject*, ReasonForDetach);
</span><span class="cx"> bool isAttached(JSGlobalObject*);
</span><span class="cx">
</span><del>- BreakpointID setBreakpoint(Breakpoint, unsigned& actualLine, unsigned& actualColumn);
</del><ins>+ void resolveBreakpoint(Breakpoint&, SourceProvider*);
+ BreakpointID setBreakpoint(Breakpoint&, bool& existing);
</ins><span class="cx"> void removeBreakpoint(BreakpointID);
</span><span class="cx"> void clearBreakpoints();
</span><ins>+
</ins><span class="cx"> void activateBreakpoints() { setBreakpointsActivated(true); }
</span><span class="cx"> void deactivateBreakpoints() { setBreakpointsActivated(false); }
</span><span class="cx"> bool breakpointsActive() const { return m_breakpointsActivated; }
</span><span class="lines">@@ -178,6 +181,8 @@
</span><span class="cx">
</span><span class="cx"> bool hasBreakpoint(SourceID, const TextPosition&, Breakpoint* hitBreakpoint);
</span><span class="cx">
</span><ins>+ DebuggerParseData& debuggerParseData(SourceID, SourceProvider*);
+
</ins><span class="cx"> void updateNeedForOpDebugCallbacks();
</span><span class="cx">
</span><span class="cx"> // These update functions are only needed because our current breakpoints are
</span><span class="lines">@@ -207,9 +212,11 @@
</span><span class="cx"> void toggleBreakpoint(Breakpoint&, BreakpointState);
</span><span class="cx">
</span><span class="cx"> void clearDebuggerRequests(JSGlobalObject*);
</span><ins>+ void clearParsedData();
</ins><span class="cx">
</span><span class="cx"> VM& m_vm;
</span><span class="cx"> HashSet<JSGlobalObject*> m_globalObjects;
</span><ins>+ HashMap<SourceID, DebuggerParseData> m_parseDataMap;
</ins><span class="cx">
</span><span class="cx"> PauseOnExceptionsState m_pauseOnExceptionsState;
</span><span class="cx"> bool m_pauseAtNextOpportunity : 1;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerParseDatacpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/debugger/DebuggerParseData.cpp (0 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerParseData.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerParseData.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -0,0 +1,184 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "DebuggerParseData.h"
+
+#include "Parser.h"
+
+namespace JSC {
+
+Optional<JSTextPosition> DebuggerPausePositions::breakpointLocationForLineColumn(int line, int column)
+{
+ unsigned start = 0;
+ unsigned end = m_positions.size();
+ while (start != end) {
+ unsigned middle = start + ((end - start) / 2);
+ DebuggerPausePosition& pausePosition = m_positions[middle];
+ int pauseLine = pausePosition.position.line;
+ int pauseColumn = pausePosition.position.offset - pausePosition.position.lineStartOffset;
+
+ if (line < pauseLine) {
+ end = middle;
+ continue;
+ }
+ if (line > pauseLine) {
+ start = middle + 1;
+ continue;
+ }
+
+ if (column == pauseColumn) {
+ // Found an exact position match. Roll forward if this was a function Entry.
+ // We are guarenteed to have a Leave for an Entry so we don't need to bounds check.
+ while (true) {
+ if (pausePosition.type != DebuggerPausePositionType::Enter)
+ return Optional<JSTextPosition>(pausePosition.position);
+ pausePosition = m_positions[middle++];
+ }
+ }
+
+ if (column < pauseColumn)
+ end = middle;
+ else
+ start = middle + 1;
+ }
+
+ // Past the end, no possible pause locations.
+ if (start >= m_positions.size())
+ return Nullopt;
+
+ // If the next location is a function Entry we will need to decide if we should go into
+ // the function or go past the function. We decide to go into the function if the
+ // input is on the same line as the function entry. For example:
+ //
+ // 1. x;
+ // 2.
+ // 3. function foo() {
+ // 4. x;
+ // 5. }
+ // 6.
+ // 7. x;
+ //
+ // If the input was line 2, skip past functions to pause on line 7.
+ // If the input was line 3, go into the function to pause on line 4.
+
+ // Valid pause location. Use it.
+ DebuggerPausePosition& firstSlidePosition = m_positions[start];
+ if (firstSlidePosition.type != DebuggerPausePositionType::Enter)
+ return Optional<JSTextPosition>(firstSlidePosition.position);
+
+ // Determine if we should enter this function or skip past it.
+ // If entryStackSize is > 0 we are skipping functions.
+ bool shouldEnterFunction = firstSlidePosition.position.line == line;
+ int entryStackSize = shouldEnterFunction ? 0 : 1;
+ for (unsigned i = start + 1; i < m_positions.size(); ++i) {
+ DebuggerPausePosition& slidePosition = m_positions[i];
+ ASSERT(entryStackSize >= 0);
+
+ // Already skipping functions.
+ if (entryStackSize) {
+ if (slidePosition.type == DebuggerPausePositionType::Enter)
+ entryStackSize++;
+ else if (slidePosition.type == DebuggerPausePositionType::Leave)
+ entryStackSize--;
+ continue;
+ }
+
+ // Start skipping functions.
+ if (slidePosition.type == DebuggerPausePositionType::Enter) {
+ entryStackSize++;
+ continue;
+ }
+
+ // Found pause position.
+ return Optional<JSTextPosition>(slidePosition.position);
+ }
+
+ // No pause positions found.
+ return Nullopt;
+}
+
+void DebuggerPausePositions::sort()
+{
+ std::sort(m_positions.begin(), m_positions.end(), [] (const DebuggerPausePosition& a, const DebuggerPausePosition& b) {
+ return a.position.offset < b.position.offset;
+ });
+}
+
+typedef enum { Program, Module } DebuggerParseInfoTag;
+template <DebuggerParseInfoTag T> struct DebuggerParseInfo { };
+
+template <> struct DebuggerParseInfo<Program> {
+ typedef JSC::ProgramNode RootNode;
+ static const SourceParseMode parseMode = SourceParseMode::ProgramMode;
+ static const JSParserStrictMode strictMode = JSParserStrictMode::NotStrict;
+ static const JSParserScriptMode scriptMode = JSParserScriptMode::Classic;
+};
+
+template <> struct DebuggerParseInfo<Module> {
+ typedef JSC::ModuleProgramNode RootNode;
+ static const SourceParseMode parseMode = SourceParseMode::ModuleEvaluateMode;
+ static const JSParserStrictMode strictMode = JSParserStrictMode::Strict;
+ static const JSParserScriptMode scriptMode = JSParserScriptMode::Module;
+};
+
+template <DebuggerParseInfoTag T>
+bool gatherDebuggerParseData(VM& vm, const SourceCode& source, DebuggerParseData& debuggerParseData)
+{
+ typedef typename DebuggerParseInfo<T>::RootNode RootNode;
+ SourceParseMode parseMode = DebuggerParseInfo<T>::parseMode;
+ JSParserStrictMode strictMode = DebuggerParseInfo<T>::strictMode;
+ JSParserScriptMode scriptMode = DebuggerParseInfo<T>::scriptMode;
+
+ ParserError error;
+ std::unique_ptr<RootNode> rootNode = parse<RootNode>(&vm, source, Identifier(),
+ JSParserBuiltinMode::NotBuiltin, strictMode, scriptMode, parseMode, SuperBinding::NotNeeded,
+ error, nullptr, ConstructorKind::None, DerivedContextType::None, EvalContextType::None,
+ &debuggerParseData);
+ if (!rootNode)
+ return false;
+
+ debuggerParseData.pausePositions.sort();
+
+ return true;
+}
+
+bool gatherDebuggerParseDataForSource(VM& vm, SourceProvider* provider, DebuggerParseData& debuggerParseData)
+{
+ int startLine = provider->startPosition().m_line.oneBasedInt();
+ int startColumn = provider->startPosition().m_column.oneBasedInt();
+ SourceCode completeSource(provider, startLine, startColumn);
+
+ switch (provider->sourceType()) {
+ case SourceProviderSourceType::Program:
+ return gatherDebuggerParseData<Program>(vm, completeSource, debuggerParseData);
+ case SourceProviderSourceType::Module:
+ return gatherDebuggerParseData<Module>(vm, completeSource, debuggerParseData);
+ default:
+ return false;
+ }
+}
+
+} // namespace JSC
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerParseDatahfromrev206652trunkSourceJavaScriptCoreparserSourceProvidercpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/debugger/DebuggerParseData.h (from rev 206652, trunk/Source/JavaScriptCore/parser/SourceProvider.cpp) (0 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerParseData.h (rev 0)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerParseData.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "ParserTokens.h"
+#include <wtf/Optional.h>
+#include <wtf/Vector.h>
+
+namespace JSC {
+
+class SourceProvider;
+class VM;
+
+enum class DebuggerPausePositionType { Enter, Leave, Pause };
+struct DebuggerPausePosition {
+ DebuggerPausePositionType type;
+ JSTextPosition position;
+};
+
+class DebuggerPausePositions {
+public:
+ DebuggerPausePositions() { }
+ ~DebuggerPausePositions() { }
+
+ void appendPause(const JSTextPosition& position)
+ {
+ m_positions.append({ DebuggerPausePositionType::Pause, position });
+ }
+
+ void appendEntry(const JSTextPosition& position)
+ {
+ m_positions.append({ DebuggerPausePositionType::Enter, position });
+ }
+
+ void appendLeave(const JSTextPosition& position)
+ {
+ m_positions.append({ DebuggerPausePositionType::Leave, position });
+ }
+
+ Optional<JSTextPosition> breakpointLocationForLineColumn(int line, int column);
+
+ void sort();
+
+private:
+ Vector<DebuggerPausePosition> m_positions;
+};
+
+
+struct DebuggerParseData {
+ DebuggerParseData() { }
+ ~DebuggerParseData() { }
+
+ DebuggerPausePositions pausePositions;
+};
+
+bool gatherDebuggerParseDataForSource(VM&, SourceProvider*, DebuggerParseData&);
+
+} // namespace JSC
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "debugger/Debugger.h"
</span><ins>+#include "parser/SourceProvider.h"
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -43,6 +44,7 @@
</span><span class="cx"> String source;
</span><span class="cx"> String sourceURL;
</span><span class="cx"> String sourceMappingURL;
</span><ins>+ RefPtr<JSC::SourceProvider> sourceProvider;
</ins><span class="cx"> int startLine {0};
</span><span class="cx"> int startColumn {0};
</span><span class="cx"> int endLine {0};
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "Exception.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSJavaScriptCallFrame.h"
</span><del>-#include "JSLock.h"
</del><span class="cx"> #include "JavaScriptCallFrame.h"
</span><span class="cx"> #include "ScriptValue.h"
</span><span class="cx"> #include "SourceProvider.h"
</span><span class="lines">@@ -56,34 +55,38 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSC::BreakpointID ScriptDebugServer::setBreakpoint(JSC::SourceID sourceID, const ScriptBreakpoint& scriptBreakpoint, unsigned* actualLineNumber, unsigned* actualColumnNumber)
</del><ins>+void ScriptDebugServer::setBreakpointActions(BreakpointID id, const ScriptBreakpoint& scriptBreakpoint)
</ins><span class="cx"> {
</span><del>- if (!sourceID)
- return JSC::noBreakpointID;
</del><ins>+ ASSERT(id != noBreakpointID);
+ ASSERT(!m_breakpointIDToActions.contains(id));
</ins><span class="cx">
</span><del>- JSC::Breakpoint breakpoint(sourceID, scriptBreakpoint.lineNumber, scriptBreakpoint.columnNumber, scriptBreakpoint.condition, scriptBreakpoint.autoContinue, scriptBreakpoint.ignoreCount);
- JSC::BreakpointID id = Debugger::setBreakpoint(breakpoint, *actualLineNumber, *actualColumnNumber);
- if (id != JSC::noBreakpointID && !scriptBreakpoint.actions.isEmpty()) {
-#ifndef NDEBUG
- BreakpointIDToActionsMap::iterator it = m_breakpointIDToActions.find(id);
- ASSERT(it == m_breakpointIDToActions.end());
-#endif
- const BreakpointActions& actions = scriptBreakpoint.actions;
- m_breakpointIDToActions.set(id, actions);
- }
- return id;
</del><ins>+ m_breakpointIDToActions.set(id, scriptBreakpoint.actions);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptDebugServer::removeBreakpoint(JSC::BreakpointID id)
</del><ins>+void ScriptDebugServer::removeBreakpointActions(BreakpointID id)
</ins><span class="cx"> {
</span><del>- ASSERT(id != JSC::noBreakpointID);
- BreakpointIDToActionsMap::iterator it = m_breakpointIDToActions.find(id);
- if (it != m_breakpointIDToActions.end())
- m_breakpointIDToActions.remove(it);
</del><ins>+ ASSERT(id != noBreakpointID);
</ins><span class="cx">
</span><del>- Debugger::removeBreakpoint(id);
</del><ins>+ m_breakpointIDToActions.remove(id);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+const BreakpointActions& ScriptDebugServer::getActionsForBreakpoint(BreakpointID id)
+{
+ ASSERT(id != noBreakpointID);
+
+ auto entry = m_breakpointIDToActions.find(id);
+ if (entry != m_breakpointIDToActions.end())
+ return entry->value;
+
+ static NeverDestroyed<BreakpointActions> emptyActionVector = BreakpointActions();
+ return emptyActionVector;
+}
+
+void ScriptDebugServer::clearBreakpointActions()
+{
+ m_breakpointIDToActions.clear();
+}
+
</ins><span class="cx"> bool ScriptDebugServer::evaluateBreakpointAction(const ScriptBreakpointAction& breakpointAction)
</span><span class="cx"> {
</span><span class="cx"> DebuggerCallFrame* debuggerCallFrame = currentDebuggerCallFrame();
</span><span class="lines">@@ -111,7 +114,7 @@
</span><span class="cx"> JSC::ExecState* exec = debuggerCallFrame->globalExec();
</span><span class="cx"> if (exception)
</span><span class="cx"> reportException(exec, exception);
</span><del>-
</del><ins>+
</ins><span class="cx"> dispatchBreakpointActionProbe(exec, breakpointAction, exception ? exception->value() : result);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -122,12 +125,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptDebugServer::clearBreakpoints()
-{
- Debugger::clearBreakpoints();
- m_breakpointIDToActions.clear();
-}
-
</del><span class="cx"> void ScriptDebugServer::dispatchDidPause(ScriptDebugListener* listener)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isPaused());
</span><span class="lines">@@ -197,7 +194,9 @@
</span><span class="cx"> {
</span><span class="cx"> JSC::SourceID sourceID = sourceProvider->asID();
</span><span class="cx">
</span><ins>+ // FIXME: <https://webkit.org/b/162773> Web Inspector: Simplify ScriptDebugListener::Script to use SourceProvider
</ins><span class="cx"> ScriptDebugListener::Script script;
</span><ins>+ script.sourceProvider = sourceProvider;
</ins><span class="cx"> script.url = sourceProvider->url();
</span><span class="cx"> script.source = sourceProvider->source().toString();
</span><span class="cx"> script.startLine = sourceProvider->startPosition().m_line.zeroBasedInt();
</span><span class="lines">@@ -289,9 +288,9 @@
</span><span class="cx">
</span><span class="cx"> m_currentProbeBatchId++;
</span><span class="cx">
</span><del>- BreakpointIDToActionsMap::iterator it = m_breakpointIDToActions.find(breakpoint.id);
- if (it != m_breakpointIDToActions.end()) {
- BreakpointActions actions = it->value;
</del><ins>+ auto entry = m_breakpointIDToActions.find(breakpoint.id);
+ if (entry != m_breakpointIDToActions.end()) {
+ BreakpointActions actions = entry->value;
</ins><span class="cx"> for (size_t i = 0; i < actions.size(); ++i) {
</span><span class="cx"> if (!evaluateBreakpointAction(actions[i]))
</span><span class="cx"> return;
</span><span class="lines">@@ -318,17 +317,6 @@
</span><span class="cx"> dispatchFunctionToListeners(&ScriptDebugServer::dispatchDidContinue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const BreakpointActions& ScriptDebugServer::getActionsForBreakpoint(JSC::BreakpointID breakpointID)
-{
- ASSERT(breakpointID != JSC::noBreakpointID);
-
- if (m_breakpointIDToActions.contains(breakpointID))
- return m_breakpointIDToActions.find(breakpointID)->value;
-
- static NeverDestroyed<BreakpointActions> emptyActionVector = BreakpointActions();
- return emptyActionVector;
-}
-
</del><span class="cx"> void ScriptDebugServer::addListener(ScriptDebugListener* listener)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(listener);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -49,10 +49,12 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ScriptDebugServer);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- JSC::BreakpointID setBreakpoint(JSC::SourceID, const ScriptBreakpoint&, unsigned* actualLineNumber, unsigned* actualColumnNumber);
- void removeBreakpoint(JSC::BreakpointID);
- void clearBreakpoints();
</del><span class="cx">
</span><ins>+ // FIXME: Move BreakpointAction handling into JSC::Debugger or InspectorDebuggerAgent.
+ void setBreakpointActions(JSC::BreakpointID, const ScriptBreakpoint&);
+ void removeBreakpointActions(JSC::BreakpointID);
+ void clearBreakpointActions();
+
</ins><span class="cx"> const BreakpointActions& getActionsForBreakpoint(JSC::BreakpointID);
</span><span class="cx">
</span><span class="cx"> void addListener(ScriptDebugListener*);
</span><span class="lines">@@ -86,7 +88,7 @@
</span><span class="cx"> void dispatchBreakpointActionSound(JSC::ExecState*, int breakpointActionIdentifier);
</span><span class="cx"> void dispatchBreakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, JSC::JSValue sample);
</span><span class="cx">
</span><del>- bool m_doneProcessingDebuggerEvents {true};
</del><ins>+ bool m_doneProcessingDebuggerEvents { true };
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> typedef HashMap<JSC::BreakpointID, BreakpointActions> BreakpointIDToActionsMap;
</span><span class="lines">@@ -100,12 +102,10 @@
</span><span class="cx"> JSC::JSValue exceptionOrCaughtValue(JSC::ExecState*);
</span><span class="cx">
</span><span class="cx"> BreakpointIDToActionsMap m_breakpointIDToActions;
</span><del>-
</del><span class="cx"> ListenerSet m_listeners;
</span><del>- bool m_callingListeners {false};
-
- unsigned m_nextProbeSampleId {1};
- unsigned m_currentProbeBatchId {0};
</del><ins>+ bool m_callingListeners { false };
+ unsigned m_nextProbeSampleId { 1 };
+ unsigned m_currentProbeBatchId { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -289,6 +289,34 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RefPtr<Inspector::Protocol::Debugger::Location> buildDebuggerLocation(const JSC::Breakpoint& breakpoint)
+{
+ ASSERT(breakpoint.resolved);
+
+ auto location = Inspector::Protocol::Debugger::Location::create()
+ .setScriptId(String::number(breakpoint.sourceID))
+ .setLineNumber(breakpoint.line)
+ .release();
+ location->setColumnNumber(breakpoint.column);
+
+ return WTFMove(location);
+}
+
+static bool parseLocation(ErrorString& errorString, const InspectorObject& location, JSC::SourceID& sourceID, unsigned& lineNumber, unsigned& columnNumber)
+{
+ String scriptIDStr;
+ if (!location.getString(ASCIILiteral("scriptId"), scriptIDStr) || !location.getInteger(ASCIILiteral("lineNumber"), lineNumber)) {
+ sourceID = JSC::noSourceID;
+ errorString = ASCIILiteral("scriptId and lineNumber are required.");
+ return false;
+ }
+
+ sourceID = scriptIDStr.toIntPtr();
+ columnNumber = 0;
+ location.getInteger(ASCIILiteral("columnNumber"), columnNumber);
+ return true;
+}
+
</ins><span class="cx"> void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString& errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const InspectorObject* options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations)
</span><span class="cx"> {
</span><span class="cx"> locations = Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>::create();
</span><span class="lines">@@ -324,32 +352,30 @@
</span><span class="cx">
</span><span class="cx"> m_javaScriptBreakpoints.set(breakpointIdentifier, buildObjectForBreakpointCookie(url, lineNumber, columnNumber, condition, actions, isRegex, autoContinue, ignoreCount));
</span><span class="cx">
</span><del>- ScriptBreakpoint breakpoint(lineNumber, columnNumber, condition, breakpointActions, autoContinue, ignoreCount);
- for (ScriptsMap::iterator it = m_scripts.begin(); it != m_scripts.end(); ++it) {
- String scriptURLForBreakpoints = !it->value.sourceURL.isEmpty() ? it->value.sourceURL : it->value.url;
</del><ins>+ for (auto& entry : m_scripts) {
+ Script& script = entry.value;
+ String scriptURLForBreakpoints = !script.sourceURL.isEmpty() ? script.sourceURL : script.url;
</ins><span class="cx"> if (!matches(scriptURLForBreakpoints, url, isRegex))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- RefPtr<Inspector::Protocol::Debugger::Location> location = resolveBreakpoint(breakpointIdentifier, it->key, breakpoint);
- if (location)
- locations->addItem(WTFMove(location));
- }
- *outBreakpointIdentifier = breakpointIdentifier;
-}
</del><ins>+ JSC::SourceID sourceID = entry.key;
+ JSC::Breakpoint breakpoint(sourceID, lineNumber, columnNumber, condition, autoContinue, ignoreCount);
+ resolveBreakpoint(script, breakpoint);
+ if (!breakpoint.resolved)
+ continue;
</ins><span class="cx">
</span><del>-static bool parseLocation(ErrorString& errorString, const InspectorObject& location, JSC::SourceID& sourceID, unsigned& lineNumber, unsigned& columnNumber)
-{
- String scriptIDStr;
- if (!location.getString(ASCIILiteral("scriptId"), scriptIDStr) || !location.getInteger(ASCIILiteral("lineNumber"), lineNumber)) {
- sourceID = JSC::noSourceID;
- errorString = ASCIILiteral("scriptId and lineNumber are required.");
- return false;
</del><ins>+ bool existing;
+ setBreakpoint(breakpoint, existing);
+ if (existing)
+ continue;
+
+ ScriptBreakpoint scriptBreakpoint(breakpoint.line, breakpoint.column, condition, breakpointActions, autoContinue, ignoreCount);
+ didSetBreakpoint(breakpoint, breakpointIdentifier, scriptBreakpoint);
+
+ locations->addItem(buildDebuggerLocation(breakpoint));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- sourceID = scriptIDStr.toIntPtr();
- columnNumber = 0;
- location.getInteger(ASCIILiteral("columnNumber"), columnNumber);
- return true;
</del><ins>+ *outBreakpointIdentifier = breakpointIdentifier;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::setBreakpoint(ErrorString& errorString, const InspectorObject& location, const InspectorObject* options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation)
</span><span class="lines">@@ -375,22 +401,61 @@
</span><span class="cx"> if (!breakpointActionsFromProtocol(errorString, actions, &breakpointActions))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- String breakpointIdentifier = String::number(sourceID) + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
- if (m_breakpointIdentifierToDebugServerBreakpointIDs.find(breakpointIdentifier) != m_breakpointIdentifierToDebugServerBreakpointIDs.end()) {
- errorString = ASCIILiteral("Breakpoint at specified location already exists.");
</del><ins>+ auto scriptIterator = m_scripts.find(sourceID);
+ if (scriptIterator == m_scripts.end()) {
+ errorString = ASCIILiteral("No script for id: ") + String::number(sourceID);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ScriptBreakpoint breakpoint(lineNumber, columnNumber, condition, breakpointActions, autoContinue, ignoreCount);
- actualLocation = resolveBreakpoint(breakpointIdentifier, sourceID, breakpoint);
- if (!actualLocation) {
</del><ins>+ Script& script = scriptIterator->value;
+ JSC::Breakpoint breakpoint(sourceID, lineNumber, columnNumber, condition, autoContinue, ignoreCount);
+ resolveBreakpoint(script, breakpoint);
+ if (!breakpoint.resolved) {
</ins><span class="cx"> errorString = ASCIILiteral("Could not resolve breakpoint");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool existing;
+ setBreakpoint(breakpoint, existing);
+ if (existing) {
+ errorString = ASCIILiteral("Breakpoint at specified location already exists");
+ return;
+ }
+
+ String breakpointIdentifier = String::number(sourceID) + ':' + String::number(breakpoint.line) + ':' + String::number(breakpoint.column);
+ ScriptBreakpoint scriptBreakpoint(breakpoint.line, breakpoint.column, condition, breakpointActions, autoContinue, ignoreCount);
+ didSetBreakpoint(breakpoint, breakpointIdentifier, scriptBreakpoint);
+
+ actualLocation = buildDebuggerLocation(breakpoint);
</ins><span class="cx"> *outBreakpointIdentifier = breakpointIdentifier;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorDebuggerAgent::didSetBreakpoint(const JSC::Breakpoint& breakpoint, const String& breakpointIdentifier, const ScriptBreakpoint& scriptBreakpoint)
+{
+ JSC::BreakpointID id = breakpoint.id;
+ m_scriptDebugServer.setBreakpointActions(id, scriptBreakpoint);
+
+ auto debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.find(breakpointIdentifier);
+ if (debugServerBreakpointIDsIterator == m_breakpointIdentifierToDebugServerBreakpointIDs.end())
+ debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.set(breakpointIdentifier, Vector<JSC::BreakpointID>()).iterator;
+ debugServerBreakpointIDsIterator->value.append(id);
+
+ m_debuggerBreakpointIdentifierToInspectorBreakpointIdentifier.set(id, breakpointIdentifier);
+}
+
+void InspectorDebuggerAgent::resolveBreakpoint(const Script& script, JSC::Breakpoint& breakpoint)
+{
+ if (breakpoint.line < static_cast<unsigned>(script.startLine) || static_cast<unsigned>(script.endLine) < breakpoint.line)
+ return;
+
+ m_scriptDebugServer.resolveBreakpoint(breakpoint, script.sourceProvider.get());
+}
+
+void InspectorDebuggerAgent::setBreakpoint(JSC::Breakpoint& breakpoint, bool& existing)
+{
+ m_scriptDebugServer.setBreakpoint(breakpoint, existing);
+}
+
</ins><span class="cx"> void InspectorDebuggerAgent::removeBreakpoint(ErrorString&, const String& breakpointIdentifier)
</span><span class="cx"> {
</span><span class="cx"> m_javaScriptBreakpoints.remove(breakpointIdentifier);
</span><span class="lines">@@ -402,6 +467,7 @@
</span><span class="cx"> for (auto& action : breakpointActions)
</span><span class="cx"> m_injectedScriptManager.releaseObjectGroup(objectGroupForBreakpointAction(action));
</span><span class="cx">
</span><ins>+ m_scriptDebugServer.removeBreakpointActions(breakpointID);
</ins><span class="cx"> m_scriptDebugServer.removeBreakpoint(breakpointID);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -419,39 +485,35 @@
</span><span class="cx"> if (!parseLocation(errorString, location, sourceID, lineNumber, columnNumber))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ScriptBreakpoint breakpoint(lineNumber, columnNumber, "", false, 0);
- m_continueToLocationBreakpointID = m_scriptDebugServer.setBreakpoint(sourceID, breakpoint, &lineNumber, &columnNumber);
- resume(errorString);
-}
</del><ins>+ auto scriptIterator = m_scripts.find(sourceID);
+ if (scriptIterator == m_scripts.end()) {
+ m_scriptDebugServer.continueProgram();
+ errorString = ASCIILiteral("No script for id: ") + String::number(sourceID);
+ return;
+ }
</ins><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
-{
- ScriptsMap::iterator scriptIterator = m_scripts.find(sourceID);
- if (scriptIterator == m_scripts.end())
- return nullptr;
</del><ins>+ String condition;
+ bool autoContinue = false;
+ unsigned ignoreCount = 0;
+ JSC::Breakpoint breakpoint(sourceID, lineNumber, columnNumber, condition, autoContinue, ignoreCount);
</ins><span class="cx"> Script& script = scriptIterator->value;
</span><del>- if (breakpoint.lineNumber < script.startLine || script.endLine < breakpoint.lineNumber)
- return nullptr;
</del><ins>+ resolveBreakpoint(script, breakpoint);
+ if (!breakpoint.resolved) {
+ m_scriptDebugServer.continueProgram();
+ errorString = ASCIILiteral("Could not resolve breakpoint");
+ return;
+ }
</ins><span class="cx">
</span><del>- unsigned actualLineNumber;
- unsigned actualColumnNumber;
- JSC::BreakpointID debugServerBreakpointID = m_scriptDebugServer.setBreakpoint(sourceID, breakpoint, &actualLineNumber, &actualColumnNumber);
- if (debugServerBreakpointID == JSC::noBreakpointID)
- return nullptr;
</del><ins>+ bool existing;
+ setBreakpoint(breakpoint, existing);
+ if (existing) {
+ m_scriptDebugServer.continueProgram();
+ return;
+ }
</ins><span class="cx">
</span><del>- BreakpointIdentifierToDebugServerBreakpointIDsMap::iterator debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.find(breakpointIdentifier);
- if (debugServerBreakpointIDsIterator == m_breakpointIdentifierToDebugServerBreakpointIDs.end())
- debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.set(breakpointIdentifier, Vector<JSC::BreakpointID>()).iterator;
- debugServerBreakpointIDsIterator->value.append(debugServerBreakpointID);
-
- m_debuggerBreakpointIdentifierToInspectorBreakpointIdentifier.set(debugServerBreakpointID, breakpointIdentifier);
</del><ins>+ m_continueToLocationBreakpointID = breakpoint.id;
</ins><span class="cx">
</span><del>- auto location = Inspector::Protocol::Debugger::Location::create()
- .setScriptId(String::number(sourceID))
- .setLineNumber(actualLineNumber)
- .release();
- location->setColumnNumber(actualColumnNumber);
- return WTFMove(location);
</del><ins>+ resume(errorString);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::searchInContent(ErrorString& error, const String& scriptIDStr, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
</span><span class="lines">@@ -638,10 +700,8 @@
</span><span class="cx"> if (scriptURLForBreakpoints.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- for (auto it = m_javaScriptBreakpoints.begin(), end = m_javaScriptBreakpoints.end(); it != end; ++it) {
- RefPtr<InspectorObject> breakpointObject;
- if (!it->value->asObject(breakpointObject))
- return;
</del><ins>+ for (auto& entry : m_javaScriptBreakpoints) {
+ RefPtr<InspectorObject> breakpointObject = entry.value;
</ins><span class="cx">
</span><span class="cx"> bool isRegex;
</span><span class="cx"> String url;
</span><span class="lines">@@ -650,23 +710,34 @@
</span><span class="cx"> if (!matches(scriptURLForBreakpoints, url, isRegex))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- ScriptBreakpoint breakpoint;
- breakpointObject->getInteger(ASCIILiteral("lineNumber"), breakpoint.lineNumber);
- breakpointObject->getInteger(ASCIILiteral("columnNumber"), breakpoint.columnNumber);
- breakpointObject->getString(ASCIILiteral("condition"), breakpoint.condition);
- breakpointObject->getBoolean(ASCIILiteral("autoContinue"), breakpoint.autoContinue);
- breakpointObject->getInteger(ASCIILiteral("ignoreCount"), breakpoint.ignoreCount);
</del><ins>+ ScriptBreakpoint scriptBreakpoint;
+ breakpointObject->getInteger(ASCIILiteral("lineNumber"), scriptBreakpoint.lineNumber);
+ breakpointObject->getInteger(ASCIILiteral("columnNumber"), scriptBreakpoint.columnNumber);
+ breakpointObject->getString(ASCIILiteral("condition"), scriptBreakpoint.condition);
+ breakpointObject->getBoolean(ASCIILiteral("autoContinue"), scriptBreakpoint.autoContinue);
+ breakpointObject->getInteger(ASCIILiteral("ignoreCount"), scriptBreakpoint.ignoreCount);
</ins><span class="cx"> ErrorString errorString;
</span><span class="cx"> RefPtr<InspectorArray> actions;
</span><span class="cx"> breakpointObject->getArray(ASCIILiteral("actions"), actions);
</span><del>- if (!breakpointActionsFromProtocol(errorString, actions, &breakpoint.actions)) {
</del><ins>+ if (!breakpointActionsFromProtocol(errorString, actions, &scriptBreakpoint.actions)) {
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::Protocol::Debugger::Location> location = resolveBreakpoint(it->key, sourceID, breakpoint);
- if (location)
- m_frontendDispatcher->breakpointResolved(it->key, location);
</del><ins>+ JSC::Breakpoint breakpoint(sourceID, scriptBreakpoint.lineNumber, scriptBreakpoint.columnNumber, scriptBreakpoint.condition, scriptBreakpoint.autoContinue, scriptBreakpoint.ignoreCount);
+ resolveBreakpoint(script, breakpoint);
+ if (!breakpoint.resolved)
+ continue;
+
+ bool existing;
+ setBreakpoint(breakpoint, existing);
+ if (existing)
+ continue;
+
+ String breakpointIdentifier = entry.key;
+ didSetBreakpoint(breakpoint, breakpointIdentifier, scriptBreakpoint);
+
+ m_frontendDispatcher->breakpointResolved(breakpointIdentifier, buildDebuggerLocation(breakpoint));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -795,6 +866,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::clearDebuggerBreakpointState()
</span><span class="cx"> {
</span><ins>+ m_scriptDebugServer.clearBreakpointActions();
</ins><span class="cx"> m_scriptDebugServer.clearBreakpoints();
</span><span class="cx">
</span><span class="cx"> m_pausedScriptState = nullptr;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> class InjectedScriptManager;
</span><span class="cx"> class InspectorArray;
</span><span class="cx"> class InspectorObject;
</span><del>-class InspectorValue;
</del><span class="cx"> class ScriptDebugServer;
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><span class="lines">@@ -131,7 +130,10 @@
</span><span class="cx"> void breakpointActionSound(int breakpointActionIdentifier) final;
</span><span class="cx"> void breakpointActionProbe(JSC::ExecState&, const ScriptBreakpointAction&, unsigned batchId, unsigned sampleId, JSC::JSValue sample) final;
</span><span class="cx">
</span><del>- RefPtr<Inspector::Protocol::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
</del><ins>+ void resolveBreakpoint(const Script&, JSC::Breakpoint&);
+ void setBreakpoint(JSC::Breakpoint&, bool& existing);
+ void didSetBreakpoint(const JSC::Breakpoint&, const String&, const ScriptBreakpoint&);
+
</ins><span class="cx"> bool assertPaused(ErrorString&);
</span><span class="cx"> void clearDebuggerBreakpointState();
</span><span class="cx"> void clearInspectorBreakpointState();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -1977,7 +1977,7 @@
</span><span class="cx"> stopWatch.start();
</span><span class="cx">
</span><span class="cx"> ParserError error;
</span><del>- bool validSyntax = checkModuleSyntax(exec, makeSource(source), error);
</del><ins>+ bool validSyntax = checkModuleSyntax(exec, makeSource(source, String(), TextPosition::minimumPosition(), SourceProviderSourceType::Module), error);
</ins><span class="cx"> stopWatch.stop();
</span><span class="cx">
</span><span class="cx"> if (!validSyntax)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -612,6 +612,11 @@
</span><span class="cx"> return isObjectLiteral(node) || isArrayLiteral(node);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool shouldSkipPauseLocation(StatementNode* statement) const
+ {
+ return !statement || statement->isLabel();
+ }
+
</ins><span class="cx"> StatementNode* createEmptyStatement(const JSTokenLocation& location) { return new (m_parserArena) EmptyStatementNode(location); }
</span><span class="cx">
</span><span class="cx"> StatementNode* createDeclarationStatement(const JSTokenLocation& location, ExpressionNode* expr, int start, int end)
</span><span class="lines">@@ -968,7 +973,18 @@
</span><span class="cx"> node->setStartOffset(offset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ JSTextPosition breakpointLocation(StatementNode* statement)
+ {
+ statement->setNeedsDebugHook();
+ return statement->position();
+ }
</ins><span class="cx">
</span><ins>+ JSTextPosition breakpointLocation(ExpressionNode* expr)
+ {
+ expr->setNeedsDebugHook();
+ return expr->position();
+ }
+
</ins><span class="cx"> void propagateArgumentsUse() { usesArguments(); }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "BuiltinNames.h"
</span><span class="cx"> #include "Error.h"
</span><ins>+#include "Interpreter.h"
</ins><span class="cx"> #include "JITCode.h"
</span><span class="cx"> #include "ParserArena.h"
</span><span class="cx"> #include "ParserTokens.h"
</span><span class="lines">@@ -190,8 +191,12 @@
</span><span class="cx">
</span><span class="cx"> ResultType resultDescriptor() const { return m_resultType; }
</span><span class="cx">
</span><ins>+ bool needsDebugHook() { return m_needsDebugHook; }
+ void setNeedsDebugHook() { m_needsDebugHook = true; }
+
</ins><span class="cx"> private:
</span><span class="cx"> ResultType m_resultType;
</span><ins>+ bool m_needsDebugHook { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class StatementNode : public Node {
</span><span class="lines">@@ -213,14 +218,19 @@
</span><span class="cx"> virtual bool isExprStatement() const { return false; }
</span><span class="cx"> virtual bool isBreak() const { return false; }
</span><span class="cx"> virtual bool isContinue() const { return false; }
</span><ins>+ virtual bool isLabel() const { return false; }
</ins><span class="cx"> virtual bool isBlock() const { return false; }
</span><span class="cx"> virtual bool isFuncDeclNode() const { return false; }
</span><span class="cx"> virtual bool isModuleDeclarationNode() const { return false; }
</span><span class="cx"> virtual bool isForOfNode() const { return false; }
</span><span class="cx">
</span><ins>+ bool needsDebugHook() { return m_needsDebugHook; }
+ void setNeedsDebugHook() { m_needsDebugHook = true; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> StatementNode* m_next;
</span><span class="cx"> int m_lastLine;
</span><ins>+ bool m_needsDebugHook { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class VariableEnvironmentNode : public ParserArenaDeletable {
</span><span class="lines">@@ -1546,6 +1556,8 @@
</span><span class="cx"> public:
</span><span class="cx"> LabelNode(const JSTokenLocation&, const Identifier& name, StatementNode*);
</span><span class="cx">
</span><ins>+ bool isLabel() const override { return true; }
+
</ins><span class="cx"> private:
</span><span class="cx"> void emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "Parser.h"
</span><span class="cx">
</span><span class="cx"> #include "ASTBuilder.h"
</span><ins>+#include "DebuggerParseData.h"
</ins><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "SetForScope.h"
</span><span class="cx"> #include "VM.h"
</span><span class="lines">@@ -30,7 +31,6 @@
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/StringPrintStream.h>
</span><span class="cx">
</span><del>-
</del><span class="cx"> #define updateErrorMessage(shouldPrintToken, ...) do {\
</span><span class="cx"> propagateError(); \
</span><span class="cx"> logError(shouldPrintToken, __VA_ARGS__); \
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-Parser<LexerType>::Parser(VM* vm, const SourceCode& source, JSParserBuiltinMode builtinMode, JSParserStrictMode strictMode, JSParserScriptMode scriptMode, SourceParseMode parseMode, SuperBinding superBinding, ConstructorKind defaultConstructorKind, DerivedContextType derivedContextType, bool isEvalContext, EvalContextType evalContextType)
</del><ins>+Parser<LexerType>::Parser(VM* vm, const SourceCode& source, JSParserBuiltinMode builtinMode, JSParserStrictMode strictMode, JSParserScriptMode scriptMode, SourceParseMode parseMode, SuperBinding superBinding, ConstructorKind defaultConstructorKind, DerivedContextType derivedContextType, bool isEvalContext, EvalContextType evalContextType, DebuggerParseData* debuggerParseData)
</ins><span class="cx"> : m_vm(vm)
</span><span class="cx"> , m_source(&source)
</span><span class="cx"> , m_hasStackOverflow(false)
</span><span class="lines">@@ -203,6 +203,7 @@
</span><span class="cx"> , m_superBinding(superBinding)
</span><span class="cx"> , m_defaultConstructorKind(defaultConstructorKind)
</span><span class="cx"> , m_immediateParentAllowsFunctionDeclarationInStatement(false)
</span><ins>+ , m_debuggerParseData(debuggerParseData)
</ins><span class="cx"> {
</span><span class="cx"> m_lexer = std::make_unique<LexerType>(vm, builtinMode, scriptMode);
</span><span class="cx"> m_lexer->setCode(source, &m_parserArena);
</span><span class="lines">@@ -592,9 +593,12 @@
</span><span class="cx"> m_statementDepth++;
</span><span class="cx"> TreeStatement result = 0;
</span><span class="cx"> bool shouldSetEndOffset = true;
</span><ins>+ bool shouldSetPauseLocation = false;
+
</ins><span class="cx"> switch (m_token.m_type) {
</span><span class="cx"> case CONSTTOKEN:
</span><span class="cx"> result = parseVariableDeclaration(context, DeclarationType::ConstDeclaration);
</span><ins>+ shouldSetPauseLocation = true;
</ins><span class="cx"> break;
</span><span class="cx"> case LET: {
</span><span class="cx"> bool shouldParseVariableDeclaration = true;
</span><span class="lines">@@ -616,7 +620,7 @@
</span><span class="cx"> bool allowFunctionDeclarationAsStatement = true;
</span><span class="cx"> result = parseExpressionOrLabelStatement(context, allowFunctionDeclarationAsStatement);
</span><span class="cx"> }
</span><del>-
</del><ins>+ shouldSetPauseLocation = !context.shouldSkipPauseLocation(result);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CLASSTOKEN:
</span><span class="lines">@@ -648,6 +652,7 @@
</span><span class="cx"> // ``` function foo() { label: function bar() { } } ```
</span><span class="cx"> bool allowFunctionDeclarationAsStatement = true;
</span><span class="cx"> result = parseExpressionOrLabelStatement(context, allowFunctionDeclarationAsStatement);
</span><ins>+ shouldSetPauseLocation = !context.shouldSkipPauseLocation(result);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="lines">@@ -657,8 +662,12 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (result && shouldSetEndOffset)
- context.setEndOffset(result, m_lastTokenEndPosition.offset);
</del><ins>+ if (result) {
+ if (shouldSetEndOffset)
+ context.setEndOffset(result, m_lastTokenEndPosition.offset);
+ if (shouldSetPauseLocation)
+ recordPauseLocation(context.breakpointLocation(result));
+ }
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -700,6 +709,7 @@
</span><span class="cx"> semanticFailIfTrue(match(CLOSEPAREN), "Must provide an expression as a do-while loop condition");
</span><span class="cx"> TreeExpression expr = parseExpression(context);
</span><span class="cx"> failIfFalse(expr, "Unable to parse do-while loop condition");
</span><ins>+ recordPauseLocation(context.breakpointLocation(expr));
</ins><span class="cx"> handleProductionOrFail(CLOSEPAREN, ")", "end", "do-while loop condition");
</span><span class="cx"> if (match(SEMICOLON))
</span><span class="cx"> next(); // Always performs automatic semicolon insertion.
</span><span class="lines">@@ -718,9 +728,10 @@
</span><span class="cx"> semanticFailIfTrue(match(CLOSEPAREN), "Must provide an expression as a while loop condition");
</span><span class="cx"> TreeExpression expr = parseExpression(context);
</span><span class="cx"> failIfFalse(expr, "Unable to parse while loop condition");
</span><ins>+ recordPauseLocation(context.breakpointLocation(expr));
</ins><span class="cx"> int endLine = tokenLine();
</span><span class="cx"> handleProductionOrFail(CLOSEPAREN, ")", "end", "while loop condition");
</span><del>-
</del><ins>+
</ins><span class="cx"> const Identifier* unused = 0;
</span><span class="cx"> startLoop();
</span><span class="cx"> TreeStatement statement = parseStatement(context, unused);
</span><span class="lines">@@ -922,6 +933,7 @@
</span><span class="cx"> TreeSourceElements sourceElements = context.createSourceElements();
</span><span class="cx"> TreeStatement body = context.createReturnStatement(location, expr, start, end);
</span><span class="cx"> context.setEndOffset(body, m_lastTokenEndPosition.offset);
</span><ins>+ recordPauseLocation(context.breakpointLocation(body));
</ins><span class="cx"> context.appendStatement(sourceElements, body);
</span><span class="cx">
</span><span class="cx"> return sourceElements;
</span><span class="lines">@@ -1249,6 +1261,7 @@
</span><span class="cx"> }
</span><span class="cx"> TreeExpression expr = parseExpression(context);
</span><span class="cx"> failIfFalse(expr, "Expected expression to enumerate");
</span><ins>+ recordPauseLocation(context.breakpointLocation(expr));
</ins><span class="cx"> JSTextPosition exprEnd = lastTokenEndPosition();
</span><span class="cx">
</span><span class="cx"> int endLine = tokenLine();
</span><span class="lines">@@ -1291,11 +1304,14 @@
</span><span class="cx"> declsEnd = lastTokenEndPosition();
</span><span class="cx"> m_allowsIn = true;
</span><span class="cx"> failIfFalse(decls, "Cannot parse for loop declarations");
</span><ins>+ recordPauseLocation(context.breakpointLocation(decls));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (match(SEMICOLON)) {
</span><span class="cx"> standardForLoop:
</span><span class="cx"> // Standard for loop
</span><ins>+ if (decls)
+ recordPauseLocation(context.breakpointLocation(decls));
</ins><span class="cx"> next();
</span><span class="cx"> TreeExpression condition = 0;
</span><span class="cx"> failIfTrue(forLoopConstDoesNotHaveInitializer && isConstDeclaration, "const variables in for loops must have initializers");
</span><span class="lines">@@ -1303,6 +1319,7 @@
</span><span class="cx"> if (!match(SEMICOLON)) {
</span><span class="cx"> condition = parseExpression(context);
</span><span class="cx"> failIfFalse(condition, "Cannot parse for loop condition expression");
</span><ins>+ recordPauseLocation(context.breakpointLocation(condition));
</ins><span class="cx"> }
</span><span class="cx"> consumeOrFail(SEMICOLON, "Expected a ';' after the for loop condition expression");
</span><span class="cx">
</span><span class="lines">@@ -1310,6 +1327,7 @@
</span><span class="cx"> if (!match(CLOSEPAREN)) {
</span><span class="cx"> increment = parseExpression(context);
</span><span class="cx"> failIfFalse(increment, "Cannot parse for loop iteration expression");
</span><ins>+ recordPauseLocation(context.breakpointLocation(increment));
</ins><span class="cx"> }
</span><span class="cx"> int endLine = tokenLine();
</span><span class="cx"> handleProductionOrFail(CLOSEPAREN, ")", "end", "for-loop header");
</span><span class="lines">@@ -1335,6 +1353,7 @@
</span><span class="cx"> }
</span><span class="cx"> TreeExpression expr = parseExpression(context);
</span><span class="cx"> failIfFalse(expr, "Cannot parse subject for-", isOfEnumeration ? "of" : "in", " statement");
</span><ins>+ recordPauseLocation(context.breakpointLocation(expr));
</ins><span class="cx"> JSTextPosition exprEnd = lastTokenEndPosition();
</span><span class="cx"> int endLine = tokenLine();
</span><span class="cx">
</span><span class="lines">@@ -1469,6 +1488,7 @@
</span><span class="cx"> int start = tokenStart();
</span><span class="cx"> TreeExpression expr = parseExpression(context);
</span><span class="cx"> failIfFalse(expr, "Cannot parse 'with' subject expression");
</span><ins>+ recordPauseLocation(context.breakpointLocation(expr));
</ins><span class="cx"> JSTextPosition end = lastTokenEndPosition();
</span><span class="cx"> int endLine = tokenLine();
</span><span class="cx"> handleProductionOrFail(CLOSEPAREN, ")", "start", "subject of a 'with' statement");
</span><span class="lines">@@ -1489,6 +1509,7 @@
</span><span class="cx"> handleProductionOrFail(OPENPAREN, "(", "start", "subject of a 'switch'");
</span><span class="cx"> TreeExpression expr = parseExpression(context);
</span><span class="cx"> failIfFalse(expr, "Cannot parse switch subject expression");
</span><ins>+ recordPauseLocation(context.breakpointLocation(expr));
</ins><span class="cx"> int endLine = tokenLine();
</span><span class="cx">
</span><span class="cx"> handleProductionOrFail(CLOSEPAREN, ")", "end", "subject of a 'switch'");
</span><span class="lines">@@ -1681,6 +1702,7 @@
</span><span class="cx"> failIfStackOverflow();
</span><span class="cx"> TreeStatement result = 0;
</span><span class="cx"> bool shouldSetEndOffset = true;
</span><ins>+ bool shouldSetPauseLocation = false;
</ins><span class="cx"> bool parentAllowsFunctionDeclarationAsStatement = m_immediateParentAllowsFunctionDeclarationInStatement;
</span><span class="cx"> m_immediateParentAllowsFunctionDeclarationInStatement = false;
</span><span class="cx">
</span><span class="lines">@@ -1691,6 +1713,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case VAR:
</span><span class="cx"> result = parseVariableDeclaration(context, DeclarationType::VarDeclaration);
</span><ins>+ shouldSetPauseLocation = true;
</ins><span class="cx"> break;
</span><span class="cx"> case FUNCTION: {
</span><span class="cx"> const bool isAsync = false;
</span><span class="lines">@@ -1701,6 +1724,7 @@
</span><span class="cx"> JSTokenLocation location(tokenLocation());
</span><span class="cx"> next();
</span><span class="cx"> result = context.createEmptyStatement(location);
</span><ins>+ shouldSetPauseLocation = true;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case IF:
</span><span class="lines">@@ -1717,12 +1741,15 @@
</span><span class="cx"> break;
</span><span class="cx"> case CONTINUE:
</span><span class="cx"> result = parseContinueStatement(context);
</span><ins>+ shouldSetPauseLocation = true;
</ins><span class="cx"> break;
</span><span class="cx"> case BREAK:
</span><span class="cx"> result = parseBreakStatement(context);
</span><ins>+ shouldSetPauseLocation = true;
</ins><span class="cx"> break;
</span><span class="cx"> case RETURN:
</span><span class="cx"> result = parseReturnStatement(context);
</span><ins>+ shouldSetPauseLocation = true;
</ins><span class="cx"> break;
</span><span class="cx"> case WITH:
</span><span class="cx"> result = parseWithStatement(context);
</span><span class="lines">@@ -1732,6 +1759,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case THROW:
</span><span class="cx"> result = parseThrowStatement(context);
</span><ins>+ shouldSetPauseLocation = true;
</ins><span class="cx"> break;
</span><span class="cx"> case TRY:
</span><span class="cx"> result = parseTryStatement(context);
</span><span class="lines">@@ -1738,6 +1766,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case DEBUGGER:
</span><span class="cx"> result = parseDebuggerStatement(context);
</span><ins>+ shouldSetPauseLocation = true;
</ins><span class="cx"> break;
</span><span class="cx"> case EOFTOK:
</span><span class="cx"> case CASE:
</span><span class="lines">@@ -1755,6 +1784,7 @@
</span><span class="cx"> case YIELD: {
</span><span class="cx"> bool allowFunctionDeclarationAsStatement = false;
</span><span class="cx"> result = parseExpressionOrLabelStatement(context, allowFunctionDeclarationAsStatement);
</span><ins>+ shouldSetPauseLocation = !context.shouldSkipPauseLocation(result);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case STRING:
</span><span class="lines">@@ -1768,11 +1798,17 @@
</span><span class="cx"> if (directive && nonTrivialExpressionCount != m_parserState.nonTrivialExpressionCount)
</span><span class="cx"> directive = nullptr;
</span><span class="cx"> result = exprStatement;
</span><ins>+ shouldSetPauseLocation = true;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (result && shouldSetEndOffset)
- context.setEndOffset(result, m_lastTokenEndPosition.offset);
</del><ins>+ if (result) {
+ if (shouldSetEndOffset)
+ context.setEndOffset(result, m_lastTokenEndPosition.offset);
+ if (shouldSetPauseLocation)
+ recordPauseLocation(context.breakpointLocation(result));
+ }
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1908,10 +1944,17 @@
</span><span class="cx">
</span><span class="cx"> DepthManager statementDepth(&m_statementDepth);
</span><span class="cx"> m_statementDepth = 0;
</span><del>- if (bodyType == ArrowFunctionBodyExpression)
- failIfFalse(parseArrowFunctionSingleExpressionBodySourceElements(syntaxChecker), "Cannot parse body of this arrow function");
- else
- failIfFalse(parseSourceElements(syntaxChecker, CheckForStrictMode), bodyType == StandardFunctionBodyBlock ? "Cannot parse body of this function" : "Cannot parse body of this arrow function");
</del><ins>+ if (bodyType == ArrowFunctionBodyExpression) {
+ if (m_debuggerParseData)
+ failIfFalse(parseArrowFunctionSingleExpressionBodySourceElements(context), "Cannot parse body of this arrow function");
+ else
+ failIfFalse(parseArrowFunctionSingleExpressionBodySourceElements(syntaxChecker), "Cannot parse body of this arrow function");
+ } else {
+ if (m_debuggerParseData)
+ failIfFalse(parseSourceElements(context, CheckForStrictMode), bodyType == StandardFunctionBodyBlock ? "Cannot parse body of this function" : "Cannot parse body of this arrow function");
+ else
+ failIfFalse(parseSourceElements(syntaxChecker, CheckForStrictMode), bodyType == StandardFunctionBodyBlock ? "Cannot parse body of this function" : "Cannot parse body of this arrow function");
+ }
</ins><span class="cx"> unsigned endColumn = tokenColumn();
</span><span class="cx"> return context.createFunctionMetadata(startLocation, tokenLocation(), startColumn, endColumn, functionKeywordStart, functionNameStart, parametersStart, strictMode(), constructorKind, superBinding, parameterCount, functionLength, parseMode, isArrowFunctionBodyExpression);
</span><span class="cx"> }
</span><span class="lines">@@ -2082,6 +2125,9 @@
</span><span class="cx"> if (UNLIKELY(!Options::useSourceProviderCache()))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (UNLIKELY(m_debuggerParseData))
+ return false;
+
</ins><span class="cx"> ASSERT(parametersStart != -1);
</span><span class="cx"> ASSERT(startColumn != -1);
</span><span class="cx">
</span><span class="lines">@@ -2328,8 +2374,11 @@
</span><span class="cx"> if (functionBodyType == ArrowFunctionBodyExpression) {
</span><span class="cx"> location = locationBeforeLastToken();
</span><span class="cx"> functionInfo.endOffset = location.endOffset;
</span><ins>+ } else {
+ recordFunctionEntryLocation(JSTextPosition(startLocation.line, startLocation.startOffset, startLocation.lineStartOffset));
+ recordFunctionLeaveLocation(JSTextPosition(location.line, location.startOffset, location.lineStartOffset));
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Cache the tokenizer state and the function scope the first time the function is parsed.
</span><span class="cx"> // Any future reparsing can then skip the function.
</span><span class="cx"> // For arrow function is 8 = x=>x + 4 symbols;
</span><span class="lines">@@ -2833,6 +2882,7 @@
</span><span class="cx">
</span><span class="cx"> TreeExpression condition = parseExpression(context);
</span><span class="cx"> failIfFalse(condition, "Expected a expression as the condition for an if statement");
</span><ins>+ recordPauseLocation(context.breakpointLocation(condition));
</ins><span class="cx"> int end = tokenLine();
</span><span class="cx"> handleProductionOrFail2(CLOSEPAREN, ")", "end", "'if' condition");
</span><span class="cx">
</span><span class="lines">@@ -2868,6 +2918,7 @@
</span><span class="cx">
</span><span class="cx"> TreeExpression innerCondition = parseExpression(context);
</span><span class="cx"> failIfFalse(innerCondition, "Expected a expression as the condition for an if statement");
</span><ins>+ recordPauseLocation(context.breakpointLocation(innerCondition));
</ins><span class="cx"> int innerEnd = tokenLine();
</span><span class="cx"> handleProductionOrFail2(CLOSEPAREN, ")", "end", "'if' condition");
</span><span class="cx"> const Identifier* unused = 0;
</span><span class="lines">@@ -3853,6 +3904,36 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><ins>+void Parser<LexerType>::recordPauseLocation(const JSTextPosition& position)
+{
+ if (LIKELY(!m_debuggerParseData))
+ return;
+
+ if (position.line < 0)
+ return;
+
+ m_debuggerParseData->pausePositions.appendPause(position);
+}
+
+template <typename LexerType>
+void Parser<LexerType>::recordFunctionEntryLocation(const JSTextPosition& position)
+{
+ if (LIKELY(!m_debuggerParseData))
+ return;
+
+ m_debuggerParseData->pausePositions.appendEntry(position);
+}
+
+template <typename LexerType>
+void Parser<LexerType>::recordFunctionLeaveLocation(const JSTextPosition& position)
+{
+ if (LIKELY(!m_debuggerParseData))
+ return;
+
+ m_debuggerParseData->pausePositions.appendLeave(position);
+}
+
+template <typename LexerType>
</ins><span class="cx"> template <class TreeBuilder> TreeExpression Parser<LexerType>::parseObjectLiteral(TreeBuilder& context)
</span><span class="cx"> {
</span><span class="cx"> SavePoint savePoint = createSavePoint();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> class VM;
</span><span class="cx"> class SourceCode;
</span><span class="cx"> class SyntaxChecker;
</span><ins>+struct DebuggerParseData;
</ins><span class="cx">
</span><span class="cx"> // Macros to make the more common TreeBuilder types a little less verbose
</span><span class="cx"> #define TreeStatement typename TreeBuilder::Statement
</span><span class="lines">@@ -847,7 +848,7 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- Parser(VM*, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, JSParserScriptMode, SourceParseMode, SuperBinding, ConstructorKind defaultConstructorKind = ConstructorKind::None, DerivedContextType = DerivedContextType::None, bool isEvalContext = false, EvalContextType = EvalContextType::None);
</del><ins>+ Parser(VM*, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, JSParserScriptMode, SourceParseMode, SuperBinding, ConstructorKind defaultConstructorKind = ConstructorKind::None, DerivedContextType = DerivedContextType::None, bool isEvalContext = false, EvalContextType = EvalContextType::None, DebuggerParseData* = nullptr);
</ins><span class="cx"> ~Parser();
</span><span class="cx">
</span><span class="cx"> template <class ParsedNode>
</span><span class="lines">@@ -1370,7 +1371,11 @@
</span><span class="cx"> m_errorMessage = String(msg);
</span><span class="cx"> ASSERT(!m_errorMessage.isNull());
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ ALWAYS_INLINE void recordPauseLocation(const JSTextPosition&);
+ ALWAYS_INLINE void recordFunctionEntryLocation(const JSTextPosition&);
+ ALWAYS_INLINE void recordFunctionLeaveLocation(const JSTextPosition&);
+
</ins><span class="cx"> void startLoop() { currentScope()->startLoop(); }
</span><span class="cx"> void endLoop() { currentScope()->endLoop(); }
</span><span class="cx"> void startSwitch() { currentScope()->startSwitch(); }
</span><span class="lines">@@ -1706,7 +1711,8 @@
</span><span class="cx"> bool m_isEvalContext;
</span><span class="cx"> bool m_immediateParentAllowsFunctionDeclarationInStatement;
</span><span class="cx"> RefPtr<ModuleScopeData> m_moduleScopeData;
</span><del>-
</del><ins>+ DebuggerParseData* m_debuggerParseData;
+
</ins><span class="cx"> struct DepthManager {
</span><span class="cx"> DepthManager(int* depth)
</span><span class="cx"> : m_originalDepth(*depth)
</span><span class="lines">@@ -1826,11 +1832,14 @@
</span><span class="cx"> const Identifier& name, JSParserBuiltinMode builtinMode,
</span><span class="cx"> JSParserStrictMode strictMode, JSParserScriptMode scriptMode, SourceParseMode parseMode, SuperBinding superBinding,
</span><span class="cx"> ParserError& error, JSTextPosition* positionBeforeLastNewline = nullptr,
</span><del>- ConstructorKind defaultConstructorKind = ConstructorKind::None, DerivedContextType derivedContextType = DerivedContextType::None, EvalContextType evalContextType = EvalContextType::None)
</del><ins>+ ConstructorKind defaultConstructorKind = ConstructorKind::None,
+ DerivedContextType derivedContextType = DerivedContextType::None,
+ EvalContextType evalContextType = EvalContextType::None,
+ DebuggerParseData* debuggerParseData = nullptr)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!source.provider()->source().isNull());
</span><span class="cx"> if (source.provider()->source().is8Bit()) {
</span><del>- Parser<Lexer<LChar>> parser(vm, source, builtinMode, strictMode, scriptMode, parseMode, superBinding, defaultConstructorKind, derivedContextType, isEvalNode<ParsedNode>(), evalContextType);
</del><ins>+ Parser<Lexer<LChar>> parser(vm, source, builtinMode, strictMode, scriptMode, parseMode, superBinding, defaultConstructorKind, derivedContextType, isEvalNode<ParsedNode>(), evalContextType, debuggerParseData);
</ins><span class="cx"> std::unique_ptr<ParsedNode> result = parser.parse<ParsedNode>(error, name, parseMode);
</span><span class="cx"> if (positionBeforeLastNewline)
</span><span class="cx"> *positionBeforeLastNewline = parser.positionBeforeLastNewline();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceCodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceCode.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceCode.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/parser/SourceCode.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -118,9 +118,9 @@
</span><span class="cx"> int m_startColumn;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- inline SourceCode makeSource(const String& source, const String& url = String(), const TextPosition& startPosition = TextPosition::minimumPosition())
</del><ins>+ inline SourceCode makeSource(const String& source, const String& url = String(), const TextPosition& startPosition = TextPosition::minimumPosition(), SourceProviderSourceType sourceType = SourceProviderSourceType::Program)
</ins><span class="cx"> {
</span><del>- return SourceCode(StringSourceProvider::create(source, url, startPosition), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
</del><ins>+ return SourceCode(StringSourceProvider::create(source, url, startPosition, sourceType), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline SourceCode SourceCode::subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceProvider.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceProvider.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/parser/SourceProvider.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -31,9 +31,10 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-SourceProvider::SourceProvider(const String& url, const TextPosition& startPosition)
</del><ins>+SourceProvider::SourceProvider(const String& url, const TextPosition& startPosition, SourceProviderSourceType sourceType)
</ins><span class="cx"> : m_url(url)
</span><span class="cx"> , m_startPosition(startPosition)
</span><ins>+ , m_sourceType(sourceType)
</ins><span class="cx"> , m_validated(false)
</span><span class="cx"> , m_id(0)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceProvider.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceProvider.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/parser/SourceProvider.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -34,11 +34,17 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+ enum class SourceProviderSourceType {
+ Program,
+ Module,
+ WebAssembly,
+ };
+
</ins><span class="cx"> class SourceProvider : public RefCounted<SourceProvider> {
</span><span class="cx"> public:
</span><span class="cx"> static const intptr_t nullID = 1;
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE SourceProvider(const String& url, const TextPosition& startPosition);
</del><ins>+ JS_EXPORT_PRIVATE SourceProvider(const String& url, const TextPosition& startPosition, SourceProviderSourceType);
</ins><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE virtual ~SourceProvider();
</span><span class="cx">
</span><span class="lines">@@ -54,6 +60,8 @@
</span><span class="cx"> const String& sourceMappingURL() const { return m_sourceMappingURLDirective; }
</span><span class="cx">
</span><span class="cx"> TextPosition startPosition() const { return m_startPosition; }
</span><ins>+ SourceProviderSourceType sourceType() const { return m_sourceType; }
+
</ins><span class="cx"> intptr_t asID()
</span><span class="cx"> {
</span><span class="cx"> if (!m_id)
</span><span class="lines">@@ -74,6 +82,7 @@
</span><span class="cx"> String m_sourceURLDirective;
</span><span class="cx"> String m_sourceMappingURLDirective;
</span><span class="cx"> TextPosition m_startPosition;
</span><ins>+ SourceProviderSourceType m_sourceType;
</ins><span class="cx"> bool m_validated : 1;
</span><span class="cx"> uintptr_t m_id : sizeof(uintptr_t) * 8 - 1;
</span><span class="cx"> };
</span><span class="lines">@@ -80,9 +89,9 @@
</span><span class="cx">
</span><span class="cx"> class StringSourceProvider : public SourceProvider {
</span><span class="cx"> public:
</span><del>- static Ref<StringSourceProvider> create(const String& source, const String& url, const TextPosition& startPosition = TextPosition::minimumPosition())
</del><ins>+ static Ref<StringSourceProvider> create(const String& source, const String& url, const TextPosition& startPosition = TextPosition::minimumPosition(), SourceProviderSourceType sourceType = SourceProviderSourceType::Program)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new StringSourceProvider(source, url, startPosition));
</del><ins>+ return adoptRef(*new StringSourceProvider(source, url, startPosition, sourceType));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned hash() const override
</span><span class="lines">@@ -96,8 +105,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StringSourceProvider(const String& source, const String& url, const TextPosition& startPosition)
- : SourceProvider(url, startPosition)
</del><ins>+ StringSourceProvider(const String& source, const String& url, const TextPosition& startPosition, SourceProviderSourceType sourceType)
+ : SourceProvider(url, startPosition, sourceType)
</ins><span class="cx"> , m_source(source.isNull() ? *StringImpl::empty() : *source.impl())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -130,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebAssemblySourceProvider(const Vector<uint8_t>& data, const String& url)
</span><del>- : SourceProvider(url, TextPosition::minimumPosition())
</del><ins>+ : SourceProvider(url, TextPosition::minimumPosition(), SourceProviderSourceType::WebAssembly)
</ins><span class="cx"> , m_source("[WebAssembly source]")
</span><span class="cx"> , m_data(data)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SyntaxChecker.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -389,10 +389,14 @@
</span><span class="cx"> return isObjectLiteral(type) || isArrayLiteral(type);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool shouldSkipPauseLocation(int) const { return true; }
+
</ins><span class="cx"> void setEndOffset(int, int) { }
</span><span class="cx"> int endOffset(int) { return 0; }
</span><span class="cx"> void setStartOffset(int, int) { }
</span><span class="cx">
</span><ins>+ JSTextPosition breakpointLocation(int) { return JSTextPosition(-1, 0, 0); }
+
</ins><span class="cx"> void propagateArgumentsUse() { }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -454,6 +454,7 @@
</span><span class="cx"> EvalExecutable::EvalExecutable(ExecState* exec, const SourceCode& source, bool inStrictContext, DerivedContextType derivedContextType, bool isArrowFunctionContext, EvalContextType evalContextType)
</span><span class="cx"> : ScriptExecutable(exec->vm().evalExecutableStructure.get(), exec->vm(), source, inStrictContext, derivedContextType, isArrowFunctionContext, evalContextType, NoIntrinsic)
</span><span class="cx"> {
</span><ins>+ ASSERT(source.provider()->sourceType() == SourceProviderSourceType::Program);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EvalExecutable::destroy(JSCell* cell)
</span><span class="lines">@@ -466,6 +467,7 @@
</span><span class="cx"> ProgramExecutable::ProgramExecutable(ExecState* exec, const SourceCode& source)
</span><span class="cx"> : ScriptExecutable(exec->vm().programExecutableStructure.get(), exec->vm(), source, false, DerivedContextType::None, false, EvalContextType::None, NoIntrinsic)
</span><span class="cx"> {
</span><ins>+ ASSERT(source.provider()->sourceType() == SourceProviderSourceType::Program);
</ins><span class="cx"> m_typeProfilingStartOffset = 0;
</span><span class="cx"> m_typeProfilingEndOffset = source.length() - 1;
</span><span class="cx"> if (exec->vm().typeProfiler() || exec->vm().controlFlowProfiler())
</span><span class="lines">@@ -482,6 +484,7 @@
</span><span class="cx"> ModuleProgramExecutable::ModuleProgramExecutable(ExecState* exec, const SourceCode& source)
</span><span class="cx"> : ScriptExecutable(exec->vm().moduleProgramExecutableStructure.get(), exec->vm(), source, false, DerivedContextType::None, false, EvalContextType::None, NoIntrinsic)
</span><span class="cx"> {
</span><ins>+ ASSERT(source.provider()->sourceType() == SourceProviderSourceType::Module);
</ins><span class="cx"> m_typeProfilingStartOffset = 0;
</span><span class="cx"> m_typeProfilingEndOffset = source.length() - 1;
</span><span class="cx"> if (exec->vm().typeProfiler() || exec->vm().controlFlowProfiler())
</span><span class="lines">@@ -751,6 +754,7 @@
</span><span class="cx"> , m_module(vm, this, module)
</span><span class="cx"> , m_functionIndex(functionIndex)
</span><span class="cx"> {
</span><ins>+ ASSERT(source.provider()->sourceType() == SourceProviderSourceType::WebAssembly);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebAssemblyExecutable::destroy(JSCell* cell)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeModuleLoaderPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> String source = exec->argument(1).toString(exec)->value(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx">
</span><del>- SourceCode sourceCode = makeSource(source, moduleKey.impl());
</del><ins>+ SourceCode sourceCode = makeSource(source, moduleKey.impl(), TextPosition::minimumPosition(), SourceProviderSourceType::Module);
</ins><span class="cx">
</span><span class="cx"> CodeProfiling profile(sourceCode);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/WebCore/ChangeLog 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Breakpoints on blank lines or comments don't break
+ https://bugs.webkit.org/show_bug.cgi?id=9885
+ <rdar://problem/6134406>
+
+ Reviewed by Mark Lam.
+
+ Tests: inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html
+ inspector/debugger/breakpoints/resolved-dump-each-line.html
+
+ * bindings/js/CachedScriptSourceProvider.h:
+ (WebCore::CachedScriptSourceProvider::CachedScriptSourceProvider):
+
+2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Stepping out of a function finishes the line that called it.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155325
</span><span class="cx"> <rdar://problem/25094578>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsCachedScriptSourceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/CachedScriptSourceProvider.h (206652 => 206653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/CachedScriptSourceProvider.h 2016-09-30 19:22:37 UTC (rev 206652)
+++ trunk/Source/WebCore/bindings/js/CachedScriptSourceProvider.h 2016-09-30 19:22:50 UTC (rev 206653)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CachedScriptSourceProvider(CachedScript* cachedScript)
</span><del>- : SourceProvider(cachedScript->response().url(), TextPosition::minimumPosition())
</del><ins>+ : SourceProvider(cachedScript->response().url(), TextPosition::minimumPosition(), JSC::SourceProviderSourceType::Program)
</ins><span class="cx"> , m_cachedScript(cachedScript)
</span><span class="cx"> {
</span><span class="cx"> m_cachedScript->addClient(this);
</span></span></pre>
</div>
</div>
</body>
</html>