<!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>[208885] 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/208885">208885</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-18 10:57:17 -0800 (Fri, 18 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Generator functions should have a displayable name when shown in stack traces
https://bugs.webkit.org/show_bug.cgi?id=164844
<rdar://problem/29300697>
Reviewed by Yusuke Suzuki.
JSTests:
* stress/generator-function-name.js:
Add another test now that we name the inner generator function
that we do not break the lexical resolution of names.
Source/JavaScriptCore:
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::createGeneratorFunctionBody):
* parser/ASTBuilder.h:
(JSC::ASTBuilder::createGeneratorFunctionBody):
New way to create a generator function with an inferred name.
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseInner):
(JSC::Parser<LexerType>::parseGeneratorFunctionSourceElements):
* parser/Parser.h:
Pass on the name of the generator wrapper function so we can
use it on the inner generator function.
LayoutTests:
* inspector/debugger/js-stacktrace-expected.txt:
* inspector/debugger/js-stacktrace.html:
Add a test case for console.trace() / Error stack inside of generators.
Modernize the test to reduce redundency and get nicer output.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestsstressgeneratorfunctionnamejs">trunk/JSTests/stress/generator-function-name.js</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerjsstacktraceexpectedtxt">trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerjsstacktracehtml">trunk/LayoutTests/inspector/debugger/js-stacktrace.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.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="#trunkSourceJavaScriptCoreparserSyntaxCheckerh">trunk/Source/JavaScriptCore/parser/SyntaxChecker.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/JSTests/ChangeLog 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-11-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Generator functions should have a displayable name when shown in stack traces
+ https://bugs.webkit.org/show_bug.cgi?id=164844
+ <rdar://problem/29300697>
+
+ Reviewed by Yusuke Suzuki.
+
+ * stress/generator-function-name.js:
+ Add another test now that we name the inner generator function
+ that we do not break the lexical resolution of names.
+
</ins><span class="cx"> 2016-11-17 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Drop arguments.caller
</span></span></pre></div>
<a id="trunkJSTestsstressgeneratorfunctionnamejs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/generator-function-name.js (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/generator-function-name.js 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/JSTests/stress/generator-function-name.js 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -10,3 +10,10 @@
</span><span class="cx">
</span><span class="cx"> var g = ok();
</span><span class="cx"> shouldBe(g.next().value, ok);
</span><ins>+
+function* generator2(factory)
+{
+ shouldBe(generator2, factory);
+};
+
+generator2(generator2).next();
</ins></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/LayoutTests/ChangeLog 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Generator functions should have a displayable name when shown in stack traces
+ https://bugs.webkit.org/show_bug.cgi?id=164844
+ <rdar://problem/29300697>
+
+ Reviewed by Yusuke Suzuki.
+
+ * inspector/debugger/js-stacktrace-expected.txt:
+ * inspector/debugger/js-stacktrace.html:
+ Add a test case for console.trace() / Error stack inside of generators.
+ Modernize the test to reduce redundency and get nicer output.
+
</ins><span class="cx"> 2016-11-17 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Add support for ByteString
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerjsstacktraceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/LayoutTests/inspector/debugger/js-stacktrace-expected.txt 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -1,9 +1,13 @@
</span><del>-Test that the inspector can parse the stack trace format used by JSC for Error instances and console.trace.
</del><ins>+Tests that we can parse the stack trace format used by JavaScriptCore and the contents of Error / console.trace stack traces.
</ins><span class="cx">
</span><ins>+
+== Running test suite: ConsoleTraceAndJavaScriptStackTrace
+-- Running test case: ConsoleTraceAndJavaScriptStackTrace.BasicError
+
</ins><span class="cx"> console.trace():
</span><span class="cx"> [
</span><span class="cx"> {
</span><del>- "lineNumber": 15,
</del><ins>+ "lineNumber": 10,
</ins><span class="cx"> "columnNumber": 22,
</span><span class="cx"> "functionName": "typeError",
</span><span class="cx"> "nativeCode": false,
</span><span class="lines">@@ -10,15 +14,15 @@
</span><span class="cx"> "programCode": false
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "lineNumber": 6,
</del><ins>+ "lineNumber": 16,
</ins><span class="cx"> "columnNumber": 21,
</span><del>- "functionName": "typeErrorWrap",
</del><ins>+ "functionName": "triggerTypeError",
</ins><span class="cx"> "nativeCode": false,
</span><span class="cx"> "programCode": false
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "lineNumber": 0,
</span><del>- "columnNumber": 14,
</del><ins>+ "columnNumber": 17,
</ins><span class="cx"> "functionName": "Global Code",
</span><span class="cx"> "nativeCode": false,
</span><span class="cx"> "programCode": true
</span><span class="lines">@@ -30,13 +34,13 @@
</span><span class="cx"> {
</span><span class="cx"> "functionName": "typeError",
</span><span class="cx"> "url": "/inspector/debugger/js-stacktrace.html",
</span><del>- "lineNumber": 14,
</del><ins>+ "lineNumber": 9,
</ins><span class="cx"> "columnNumber": 30
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "functionName": "typeErrorWrap",
</del><ins>+ "functionName": "triggerTypeError",
</ins><span class="cx"> "url": "/inspector/debugger/js-stacktrace.html",
</span><del>- "lineNumber": 7,
</del><ins>+ "lineNumber": 17,
</ins><span class="cx"> "columnNumber": 21
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -47,10 +51,12 @@
</span><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+-- Running test case: ConsoleTraceAndJavaScriptStackTrace.ErrorInNativeCall
+
</ins><span class="cx"> console.trace():
</span><span class="cx"> [
</span><span class="cx"> {
</span><del>- "lineNumber": 15,
</del><ins>+ "lineNumber": 10,
</ins><span class="cx"> "columnNumber": 22,
</span><span class="cx"> "functionName": "typeError",
</span><span class="cx"> "nativeCode": false,
</span><span class="lines">@@ -64,15 +70,15 @@
</span><span class="cx"> "programCode": false
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "lineNumber": 22,
</del><ins>+ "lineNumber": 20,
</ins><span class="cx"> "columnNumber": 20,
</span><del>- "functionName": "testWithNativeCallInBetween",
</del><ins>+ "functionName": "triggerTypeErrorWithNativeCallInBetween",
</ins><span class="cx"> "nativeCode": false,
</span><span class="cx"> "programCode": false
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "lineNumber": 0,
</span><del>- "columnNumber": 28,
</del><ins>+ "columnNumber": 40,
</ins><span class="cx"> "functionName": "Global Code",
</span><span class="cx"> "nativeCode": false,
</span><span class="cx"> "programCode": true
</span><span class="lines">@@ -84,7 +90,7 @@
</span><span class="cx"> {
</span><span class="cx"> "functionName": "typeError",
</span><span class="cx"> "url": "/inspector/debugger/js-stacktrace.html",
</span><del>- "lineNumber": 14,
</del><ins>+ "lineNumber": 9,
</ins><span class="cx"> "columnNumber": 30
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -94,9 +100,9 @@
</span><span class="cx"> "columnNumber": 0
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "functionName": "testWithNativeCallInBetween",
</del><ins>+ "functionName": "triggerTypeErrorWithNativeCallInBetween",
</ins><span class="cx"> "url": "/inspector/debugger/js-stacktrace.html",
</span><del>- "lineNumber": 23,
</del><ins>+ "lineNumber": 21,
</ins><span class="cx"> "columnNumber": 20
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -107,19 +113,122 @@
</span><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+-- Running test case: ConsoleTraceAndJavaScriptStackTrace.ErrorInAnonymousFunction
+
</ins><span class="cx"> Error object:
</span><span class="cx"> [
</span><span class="cx"> {
</span><span class="cx"> "functionName": "",
</span><span class="cx"> "url": "/inspector/debugger/js-stacktrace.html",
</span><del>- "lineNumber": 31,
</del><ins>+ "lineNumber": 29,
</ins><span class="cx"> "columnNumber": 33
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "functionName": "global code",
</span><span class="cx"> "url": "/inspector/debugger/js-stacktrace.html",
</span><del>- "lineNumber": 35,
</del><ins>+ "lineNumber": 33,
</ins><span class="cx"> "columnNumber": 3
</span><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+-- Running test case: ConsoleTraceAndJavaScriptStackTrace.ErrorInGenerator
+
+console.trace():
+[
+ {
+ "lineNumber": 10,
+ "columnNumber": 22,
+ "functionName": "typeError",
+ "nativeCode": false,
+ "programCode": false
+ },
+ {
+ "lineNumber": 43,
+ "columnNumber": 20,
+ "functionName": "generator2",
+ "nativeCode": false,
+ "programCode": false
+ },
+ {
+ "lineNumber": null,
+ "columnNumber": null,
+ "functionName": "generatorResume",
+ "nativeCode": true,
+ "programCode": false
+ },
+ {
+ "lineNumber": 39,
+ "columnNumber": 12,
+ "functionName": "generator1",
+ "nativeCode": false,
+ "programCode": false
+ },
+ {
+ "lineNumber": null,
+ "columnNumber": null,
+ "functionName": "generatorResume",
+ "nativeCode": true,
+ "programCode": false
+ },
+ {
+ "lineNumber": 47,
+ "columnNumber": 29,
+ "functionName": "triggerGeneratorError",
+ "nativeCode": false,
+ "programCode": false
+ },
+ {
+ "lineNumber": 0,
+ "columnNumber": 22,
+ "functionName": "Global Code",
+ "nativeCode": false,
+ "programCode": true
+ }
+]
+
+Error object:
+[
+ {
+ "functionName": "typeError",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": 9,
+ "columnNumber": 30
+ },
+ {
+ "functionName": "generator2",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": 44,
+ "columnNumber": 20
+ },
+ {
+ "functionName": "generatorResume",
+ "url": "[native code]",
+ "lineNumber": 0,
+ "columnNumber": 0
+ },
+ {
+ "functionName": "generator1",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": 40,
+ "columnNumber": 12
+ },
+ {
+ "functionName": "generatorResume",
+ "url": "[native code]",
+ "lineNumber": 0,
+ "columnNumber": 0
+ },
+ {
+ "functionName": "triggerGeneratorError",
+ "url": "/inspector/debugger/js-stacktrace.html",
+ "lineNumber": 48,
+ "columnNumber": 29
+ },
+ {
+ "functionName": "global code",
+ "url": "",
+ "lineNumber": 0,
+ "columnNumber": 0
+ }
+]
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerjsstacktracehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/debugger/js-stacktrace.html (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/js-stacktrace.html 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/LayoutTests/inspector/debugger/js-stacktrace.html 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -1,15 +1,10 @@
</span><ins>+<!DOCTYPE html>
</ins><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script src="../../http/tests/inspector/resources/inspector-test.js"></script>
</span><span class="cx"> <script>
</span><del>-function typeErrorWrap()
-{
- return typeError();
-}
-
-function typeError()
-{
- var object = {};
</del><ins>+function typeError() {
+ let object = {};
</ins><span class="cx"> try {
</span><span class="cx"> object.propertyDoesnt.exist;
</span><span class="cx"> } catch (e) {
</span><span class="lines">@@ -18,15 +13,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function testWithNativeCallInBetween()
-{
</del><ins>+function triggerTypeError() {
+ return typeError();
+}
+
+function triggerTypeErrorWithNativeCallInBetween() {
</ins><span class="cx"> return [42].map(typeError)[0];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-var _anonymousFunctionError = null;
</del><ins>+let _anonymousFunctionError = null;
</ins><span class="cx">
</span><span class="cx"> (function() {
</span><del>- var object = {};
</del><ins>+ let object = {};
</ins><span class="cx"> try {
</span><span class="cx"> object.methodDoesntExist();
</span><span class="cx"> } catch (e) {
</span><span class="lines">@@ -38,17 +36,54 @@
</span><span class="cx"> return _anonymousFunctionError;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function* generator1() {
+ yield* generator2();
+}
</ins><span class="cx">
</span><ins>+function* generator2() {
+ yield typeError();
+}
+
+function triggerGeneratorError() {
+ return generator1().next().value;
+}
+
</ins><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, function(event) {
</del><ins>+ function stripFilePaths(stackTrace) {
+ for (let frame of stackTrace) {
+ if (typeof frame.url === "string")
+ frame.url = frame.url.replace(/^.+?LayoutTests/, "");
+ }
+ return stackTrace;
+ }
+
+ function stripCallFramesAfterEval(stackTrace) {
+ for (let i = 0; i < stackTrace.length; ++i) {
+ let frame = stackTrace[i];
+ if (frame.programCode)
+ return stackTrace.slice(0, i + 1);
+ }
+ return stackTrace;
+ }
+
+ function stripPayloadAfterGlobalCode(stackTrace) {
+ for (let i = 0; i < stackTrace.length; ++i) {
+ let frame = stackTrace[i];
+ if (frame.functionName === "global code")
+ return stackTrace.slice(0, i + 1);
+ }
+ return stackTrace;
+ }
+
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</ins><span class="cx"> InspectorTest.log("\nconsole.trace():");
</span><span class="cx">
</span><del>- var stackTrace = [];
- var callFramesBeforeEval = stripCallFramesAfterEval(event.data.message.stackTrace.callFrames);
- for (var callFrame of callFramesBeforeEval) {
- var lineNumber = callFrame.sourceCodeLocation ? callFrame.sourceCodeLocation.lineNumber : null;
- var columnNumber = callFrame.sourceCodeLocation ? callFrame.sourceCodeLocation.columnNumber : null;
</del><ins>+ let stackTrace = [];
+ let callFramesBeforeEval = stripCallFramesAfterEval(event.data.message.stackTrace.callFrames);
+ for (let callFrame of callFramesBeforeEval) {
+ let lineNumber = callFrame.sourceCodeLocation ? callFrame.sourceCodeLocation.lineNumber : null;
+ let columnNumber = callFrame.sourceCodeLocation ? callFrame.sourceCodeLocation.columnNumber : null;
</ins><span class="cx"> stackTrace.push({
</span><span class="cx"> lineNumber: lineNumber,
</span><span class="cx"> columnNumber: columnNumber,
</span><span class="lines">@@ -60,82 +95,50 @@
</span><span class="cx">
</span><span class="cx"> InspectorTest.log(JSON.stringify(stackTrace, null, 4));
</span><span class="cx"> });
</span><ins>+
</ins><span class="cx">
</span><del>- InspectorTest.evaluateInPage("typeErrorWrap()", function(error, result) {
- InspectorTest.log("\nError object:");
</del><ins>+ let suite = InspectorTest.createAsyncSuite("ConsoleTraceAndJavaScriptStackTrace");
</ins><span class="cx">
</span><del>- if (error)
- InspectorTest.log(error);
</del><ins>+ function addTestCase({name, expression}) {
+ suite.addTestCase({
+ name,
+ test(resolve, reject) {
+ InspectorTest.evaluateInPage(expression, (error, result) => {
+ InspectorTest.assert(!error, error);
+ InspectorTest.log("\nError object:");
+ let stackTrace = stripFilePaths(stripPayloadAfterGlobalCode(WebInspector.StackTrace._parseStackTrace(result.value)));
+ InspectorTest.log(JSON.stringify(stackTrace, null, 4));
+ resolve();
+ });
+ }
+ });
+ }
</ins><span class="cx">
</span><del>- var stackTrace = stripPayloadAfterGlobalCode(WebInspector.StackTrace._parseStackTrace(result.value));
- stackTrace = stripFilePaths(stackTrace);
</del><ins>+ addTestCase({
+ name: "ConsoleTraceAndJavaScriptStackTrace.BasicError",
+ expression: "triggerTypeError()",
+ });
</ins><span class="cx">
</span><del>- InspectorTest.log(JSON.stringify(stackTrace, null, 4));
- InspectorTest.completeTest();
</del><ins>+ addTestCase({
+ name: "ConsoleTraceAndJavaScriptStackTrace.ErrorInNativeCall",
+ expression: "triggerTypeErrorWithNativeCallInBetween()",
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.evaluateInPage("testWithNativeCallInBetween()", function(error, result) {
- InspectorTest.log("\nError object:");
-
- if (error)
- InspectorTest.log(error);
-
- var stackTrace = stripPayloadAfterGlobalCode(WebInspector.StackTrace._parseStackTrace(result.value));
- stackTrace = stripFilePaths(stackTrace);
-
- InspectorTest.log(JSON.stringify(stackTrace, null, 4));
- InspectorTest.completeTest();
</del><ins>+ addTestCase({
+ name: "ConsoleTraceAndJavaScriptStackTrace.ErrorInAnonymousFunction",
+ expression: "getAnonymousFunctionError()",
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- InspectorTest.evaluateInPage("getAnonymousFunctionError()", function(error, result) {
- InspectorTest.log("\nError object:");
-
- if (error)
- InspectorTest.log(error);
-
- var stackTrace = stripPayloadAfterGlobalCode(WebInspector.StackTrace._parseStackTrace(result.value));
- stackTrace = stripFilePaths(stackTrace);
-
- InspectorTest.log(JSON.stringify(stackTrace, null, 4));
- InspectorTest.completeTest();
</del><ins>+ addTestCase({
+ name: "ConsoleTraceAndJavaScriptStackTrace.ErrorInGenerator",
+ expression: "triggerGeneratorError()",
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- function stripFilePaths(stackTrace)
- {
- for (var frame of stackTrace) {
- if (typeof frame.url === "string")
- frame.url = frame.url.replace(/^.+?LayoutTests/, "");
- }
- return stackTrace;
- }
-
- function stripCallFramesAfterEval(stackTrace)
- {
- var index = 0;
- for (var frame of stackTrace) {
- index++;
- if (frame.programCode)
- break;
- }
- return stackTrace.slice(0, index);
- }
-
- function stripPayloadAfterGlobalCode(payload)
- {
- var index = 0;
- for (var frame of payload) {
- index++;
- if (frame.functionName === "global code")
- break;
- }
- return payload.slice(0, index);
- }
</del><ins>+ suite.runTestCasesAndFinish();
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="runTest()">
</span><del>-<p>
-Test that the inspector can parse the stack trace format used by JSC for Error instances and console.trace.<br>
-</p>
</del><ins>+<p>Tests that we can parse the stack trace format used by JavaScriptCore and the contents of Error / console.trace stack traces.</p>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Generator functions should have a displayable name when shown in stack traces
+ https://bugs.webkit.org/show_bug.cgi?id=164844
+ <rdar://problem/29300697>
+
+ Reviewed by Yusuke Suzuki.
+
+ * parser/SyntaxChecker.h:
+ (JSC::SyntaxChecker::createGeneratorFunctionBody):
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::createGeneratorFunctionBody):
+ New way to create a generator function with an inferred name.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseInner):
+ (JSC::Parser<LexerType>::parseGeneratorFunctionSourceElements):
+ * parser/Parser.h:
+ Pass on the name of the generator wrapper function so we can
+ use it on the inner generator function.
+
</ins><span class="cx"> 2016-11-17 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add an experimental API to find elements across shadow boundaries
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -389,6 +389,14 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ExpressionNode* createGeneratorFunctionBody(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& functionInfo, const Identifier& name)
+ {
+ FuncExprNode* result = static_cast<FuncExprNode*>(createFunctionExpr(location, functionInfo));
+ if (!name.isNull())
+ result->metadata()->setInferredName(name);
+ return result;
+ }
+
</ins><span class="cx"> ExpressionNode* createAsyncFunctionBody(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& functionInfo, SourceParseMode parseMode)
</span><span class="cx"> {
</span><span class="cx"> if (parseMode == SourceParseMode::AsyncArrowFunctionBodyMode) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> else if (isModuleParseMode(parseMode))
</span><span class="cx"> sourceElements = parseModuleSourceElements(context, parseMode);
</span><span class="cx"> else if (parseMode == SourceParseMode::GeneratorWrapperFunctionMode)
</span><del>- sourceElements = parseGeneratorFunctionSourceElements(context, CheckForStrictMode);
</del><ins>+ sourceElements = parseGeneratorFunctionSourceElements(context, calleeName, CheckForStrictMode);
</ins><span class="cx"> else
</span><span class="cx"> sourceElements = parseSourceElements(context, CheckForStrictMode);
</span><span class="cx"> }
</span><span class="lines">@@ -504,7 +504,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseGeneratorFunctionSourceElements(TreeBuilder& context, SourceElementsMode mode)
</del><ins>+template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseGeneratorFunctionSourceElements(TreeBuilder& context, const Identifier& name, SourceElementsMode mode)
</ins><span class="cx"> {
</span><span class="cx"> auto sourceElements = context.createSourceElements();
</span><span class="cx">
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> info.endOffset = m_token.m_data.offset;
</span><span class="cx"> info.parametersStartColumn = startColumn;
</span><span class="cx">
</span><del>- auto functionExpr = context.createFunctionExpr(startLocation, info);
</del><ins>+ auto functionExpr = context.createGeneratorFunctionBody(startLocation, info, name);
</ins><span class="cx"> auto statement = context.createExprStatement(startLocation, functionExpr, start, m_lastTokenEndPosition.line);
</span><span class="cx"> context.appendStatement(sourceElements, statement);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -1468,7 +1468,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <class TreeBuilder> TreeSourceElements parseSourceElements(TreeBuilder&, SourceElementsMode);
</span><del>- template <class TreeBuilder> TreeSourceElements parseGeneratorFunctionSourceElements(TreeBuilder&, SourceElementsMode);
</del><ins>+ template <class TreeBuilder> TreeSourceElements parseGeneratorFunctionSourceElements(TreeBuilder&, const Identifier& name, SourceElementsMode);
</ins><span class="cx"> template <class TreeBuilder> TreeSourceElements parseAsyncFunctionSourceElements(TreeBuilder&, SourceParseMode, bool isArrowFunctionBodyExpression, SourceElementsMode);
</span><span class="cx"> template <class TreeBuilder> TreeStatement parseStatementListItem(TreeBuilder&, const Identifier*& directive, unsigned* directiveLiteralLength);
</span><span class="cx"> template <class TreeBuilder> TreeStatement parseStatement(TreeBuilder&, const Identifier*& directive, unsigned* directiveLiteralLength = 0);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SyntaxChecker.h (208884 => 208885)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2016-11-18 15:17:36 UTC (rev 208884)
+++ trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2016-11-18 18:57:17 UTC (rev 208885)
</span><span class="lines">@@ -184,6 +184,7 @@
</span><span class="cx"> ExpressionType createAwait(const JSTokenLocation&, ExpressionType, int, int, int) { return AwaitExpr; }
</span><span class="cx"> ClassExpression createClassExpr(const JSTokenLocation&, const ParserClassInfo<SyntaxChecker>&, VariableEnvironment&, ExpressionType, ExpressionType, PropertyList, PropertyList) { return ClassExpr; }
</span><span class="cx"> ExpressionType createFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&) { return FunctionExpr; }
</span><ins>+ ExpressionType createGeneratorFunctionBody(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&, const Identifier&) { return FunctionExpr; }
</ins><span class="cx"> ExpressionType createAsyncFunctionBody(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&) { return FunctionExpr; }
</span><span class="cx"> int createFunctionMetadata(const JSTokenLocation&, const JSTokenLocation&, int, int, bool, int, int, int, ConstructorKind, SuperBinding, unsigned, int, SourceParseMode, bool, InnerArrowFunctionCodeFeatures = NoInnerArrowFunctionFeatures) { return FunctionBodyResult; }
</span><span class="cx"> ExpressionType createArrowFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&) { return FunctionExpr; }
</span></span></pre>
</div>
</div>
</body>
</html>