<!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>[186959] 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/186959">186959</a></dd>
<dt>Author</dt> <dd>saambarati1@gmail.com</dd>
<dt>Date</dt> <dd>2015-07-17 11:48:30 -0700 (Fri, 17 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Function parameters should be parsed in the same parser arena as the function body
https://bugs.webkit.org/show_bug.cgi?id=145995
Reviewed by Yusuke Suzuki.
Source/JavaScriptCore:
This patch changes how functions are parsed in JSC. A function's
parameters are now parsed in the same arena as the function itself.
This allows us to arena allocate all destructuring AST nodes and
the FunctionParameters node. This will help make implementing ES6
default parameter values sane.
A source code that represents a function now includes the text of the function's
parameters. The starting offset is at the opening parenthesis of the parameter
list or at the starting character of the identifier for arrow functions that
have single arguments and don't start with parenthesis.
For example:
"function (param1, param2) { ... }"
^
| This offset used to be the starting offset of a function's SourceCode
^
| This is the new starting offset for a function's SourceCode.
This requires us to change how some offsets are calculated
and also requires us to report some different line numbers for internal
metrics that use a SourceCode's starting line and column numbers.
This patch also does a bit of cleanup with regards to how
functions are parsed in general (especially arrow functions).
It removes some unnecessary #ifdefs and the likes for arrow
to make things clearer and more deliberate.
* API/JSScriptRef.cpp:
(parseScript):
* builtins/BuiltinExecutables.cpp:
(JSC::BuiltinExecutables::createExecutableInternal):
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::generateFunctionCodeBlock):
(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
(JSC::UnlinkedFunctionExecutable::visitChildren):
(JSC::UnlinkedFunctionExecutable::parameterCount): Deleted.
* bytecode/UnlinkedCodeBlock.h:
* bytecompiler/NodesCodegen.cpp:
(JSC::DestructuringAssignmentNode::emitBytecode):
(JSC::assignDefaultValueIfUndefined):
(JSC::ArrayPatternNode::collectBoundIdentifiers):
(JSC::DestructuringPatternNode::~DestructuringPatternNode): Deleted.
* parser/ASTBuilder.h:
(JSC::ASTBuilder::createClassExpr):
(JSC::ASTBuilder::createFunctionExpr):
(JSC::ASTBuilder::createFunctionBody):
(JSC::ASTBuilder::createArrowFunctionExpr):
(JSC::ASTBuilder::createGetterOrSetterProperty):
(JSC::ASTBuilder::createElementList):
(JSC::ASTBuilder::createFormalParameterList):
(JSC::ASTBuilder::appendParameter):
(JSC::ASTBuilder::createClause):
(JSC::ASTBuilder::createClauseList):
(JSC::ASTBuilder::createFuncDeclStatement):
(JSC::ASTBuilder::createForInLoop):
(JSC::ASTBuilder::createForOfLoop):
(JSC::ASTBuilder::isResolve):
(JSC::ASTBuilder::createDestructuringAssignment):
(JSC::ASTBuilder::createArrayPattern):
(JSC::ASTBuilder::appendArrayPatternSkipEntry):
(JSC::ASTBuilder::appendArrayPatternEntry):
(JSC::ASTBuilder::appendArrayPatternRestEntry):
(JSC::ASTBuilder::finishArrayPattern):
(JSC::ASTBuilder::createObjectPattern):
(JSC::ASTBuilder::appendObjectPatternEntry):
(JSC::ASTBuilder::createBindingLocation):
(JSC::ASTBuilder::setEndOffset):
* parser/Lexer.cpp:
(JSC::Lexer<T>::Lexer):
(JSC::Lexer<T>::nextTokenIsColon):
(JSC::Lexer<T>::setTokenPosition):
(JSC::Lexer<T>::lex):
(JSC::Lexer<T>::clear):
* parser/Lexer.h:
(JSC::Lexer::setIsReparsingFunction):
(JSC::Lexer::isReparsingFunction):
(JSC::Lexer::lineNumber):
(JSC::Lexer::setIsReparsing): Deleted.
(JSC::Lexer::isReparsing): Deleted.
* parser/NodeConstructors.h:
(JSC::TryNode::TryNode):
(JSC::FunctionParameters::FunctionParameters):
(JSC::FuncExprNode::FuncExprNode):
(JSC::FuncDeclNode::FuncDeclNode):
(JSC::ArrayPatternNode::ArrayPatternNode):
(JSC::ObjectPatternNode::ObjectPatternNode):
(JSC::BindingNode::BindingNode):
(JSC::DestructuringAssignmentNode::DestructuringAssignmentNode):
(JSC::ParameterNode::ParameterNode): Deleted.
(JSC::ArrayPatternNode::create): Deleted.
(JSC::ObjectPatternNode::create): Deleted.
(JSC::BindingNode::create): Deleted.
* parser/Nodes.cpp:
(JSC::ProgramNode::ProgramNode):
(JSC::EvalNode::EvalNode):
(JSC::FunctionBodyNode::FunctionBodyNode):
(JSC::FunctionBodyNode::finishParsing):
(JSC::FunctionNode::FunctionNode):
(JSC::FunctionNode::finishParsing):
(JSC::FunctionParameters::create): Deleted.
(JSC::FunctionParameters::FunctionParameters): Deleted.
(JSC::FunctionParameters::~FunctionParameters): Deleted.
* parser/Nodes.h:
(JSC::ProgramNode::startColumn):
(JSC::ProgramNode::endColumn):
(JSC::EvalNode::startColumn):
(JSC::EvalNode::endColumn):
(JSC::FunctionParameters::size):
(JSC::FunctionParameters::at):
(JSC::FunctionParameters::append):
(JSC::FuncExprNode::body):
(JSC::DestructuringPatternNode::~DestructuringPatternNode):
(JSC::DestructuringPatternNode::isBindingNode):
(JSC::DestructuringPatternNode::emitDirectBinding):
(JSC::ArrayPatternNode::appendIndex):
(JSC::ObjectPatternNode::appendEntry):
(JSC::BindingNode::boundProperty):
(JSC::BindingNode::divotStart):
(JSC::BindingNode::divotEnd):
(JSC::DestructuringAssignmentNode::bindings):
(JSC::FuncDeclNode::body):
(JSC::ParameterNode::pattern): Deleted.
(JSC::ParameterNode::nextParam): Deleted.
(JSC::FunctionParameters::patterns): Deleted.
* parser/Parser.cpp:
(JSC::Parser<LexerType>::Parser):
(JSC::Parser<LexerType>::~Parser):
(JSC::Parser<LexerType>::parseInner):
(JSC::Parser<LexerType>::allowAutomaticSemicolon):
(JSC::Parser<LexerType>::parseSourceElements):
(JSC::Parser<LexerType>::createBindingPattern):
(JSC::Parser<LexerType>::parseArrowFunctionSingleExpressionBodySourceElements):
(JSC::Parser<LexerType>::tryParseDestructuringPatternExpression):
(JSC::Parser<LexerType>::parseSwitchClauses):
(JSC::Parser<LexerType>::parseSwitchDefaultClause):
(JSC::Parser<LexerType>::parseBlockStatement):
(JSC::Parser<LexerType>::parseStatement):
(JSC::Parser<LexerType>::parseFormalParameters):
(JSC::Parser<LexerType>::parseFunctionBody):
(JSC::stringForFunctionMode):
(JSC::Parser<LexerType>::parseFunctionParameters):
(JSC::Parser<LexerType>::parseFunctionInfo):
(JSC::Parser<LexerType>::parseFunctionDeclaration):
(JSC::Parser<LexerType>::parseClass):
(JSC::Parser<LexerType>::parsePrimaryExpression):
(JSC::Parser<LexerType>::parseMemberExpression):
(JSC::Parser<LexerType>::parseArrowFunctionExpression):
(JSC::operatorString):
(JSC::Parser<LexerType>::parseArrowFunctionSingleExpressionBody): Deleted.
* parser/Parser.h:
(JSC::Parser::positionBeforeLastNewline):
(JSC::Parser::locationBeforeLastToken):
(JSC::Parser::findCachedFunctionInfo):
(JSC::Parser::isofToken):
(JSC::Parser::isEndOfArrowFunction):
(JSC::Parser::isArrowFunctionParamters):
(JSC::Parser::tokenStart):
(JSC::Parser::isLETMaskedAsIDENT):
(JSC::Parser::autoSemiColon):
(JSC::Parser::setEndOfStatement):
(JSC::Parser::canRecurse):
(JSC::Parser<LexerType>::parse):
(JSC::parse):
* parser/ParserFunctionInfo.h:
* parser/ParserModes.h:
(JSC::functionNameIsInScope):
* parser/SourceCode.h:
(JSC::makeSource):
(JSC::SourceCode::subExpression):
(JSC::SourceCode::subArrowExpression): Deleted.
* parser/SourceProviderCache.h:
(JSC::SourceProviderCache::get):
* parser/SourceProviderCacheItem.h:
(JSC::SourceProviderCacheItem::endFunctionToken):
(JSC::SourceProviderCacheItem::usedVariables):
(JSC::SourceProviderCacheItem::writtenVariables):
(JSC::SourceProviderCacheItem::SourceProviderCacheItem):
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::SyntaxChecker):
(JSC::SyntaxChecker::createClassExpr):
(JSC::SyntaxChecker::createFunctionExpr):
(JSC::SyntaxChecker::createFunctionBody):
(JSC::SyntaxChecker::createArrowFunctionExpr):
(JSC::SyntaxChecker::setFunctionNameStart):
(JSC::SyntaxChecker::createArguments):
(JSC::SyntaxChecker::createPropertyList):
(JSC::SyntaxChecker::createElementList):
(JSC::SyntaxChecker::createFormalParameterList):
(JSC::SyntaxChecker::appendParameter):
(JSC::SyntaxChecker::createClause):
(JSC::SyntaxChecker::createClauseList):
* runtime/CodeCache.cpp:
(JSC::CodeCache::getGlobalCodeBlock):
(JSC::CodeCache::getFunctionExecutableFromGlobalCode):
* runtime/Completion.cpp:
(JSC::checkSyntax):
* runtime/Executable.cpp:
(JSC::ProgramExecutable::checkSyntax):
* tests/controlFlowProfiler/conditional-expression.js:
(testConditionalFunctionCall):
LayoutTests:
* fast/profiler/anonymous-event-handler-expected.txt:
* fast/profiler/anonymous-function-called-from-different-contexts-expected.txt:
* fast/profiler/anonymous-function-calls-built-in-functions-expected.txt:
* fast/profiler/anonymous-function-calls-eval-expected.txt:
* fast/profiler/anonymous-functions-with-display-names-expected.txt:
* fast/profiler/apply-expected.txt:
* fast/profiler/built-in-function-calls-anonymous-expected.txt:
* fast/profiler/built-in-function-calls-user-defined-function-expected.txt:
* fast/profiler/call-expected.txt:
* fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope-expected.txt:
* fast/profiler/compare-multiple-profiles-expected.txt:
* fast/profiler/constructor-expected.txt:
* fast/profiler/dead-time-expected.txt:
* fast/profiler/document-dot-write-expected.txt:
* fast/profiler/event-handler-expected.txt:
* fast/profiler/execution-context-and-eval-on-same-line-expected.txt:
* fast/profiler/inline-event-handler-expected.txt:
* fast/profiler/many-calls-in-the-same-scope-expected.txt:
* fast/profiler/multiple-and-different-scoped-anonymous-function-calls-expected.txt:
* fast/profiler/multiple-and-different-scoped-function-calls-expected.txt:
* fast/profiler/multiple-anonymous-functions-called-from-the-same-function-expected.txt:
* fast/profiler/multiple-frames-expected.txt:
* fast/profiler/named-functions-with-display-names-expected.txt:
* fast/profiler/nested-anonymous-functon-expected.txt:
* fast/profiler/nested-start-and-stop-profiler-expected.txt:
* fast/profiler/one-execution-context-expected.txt:
* fast/profiler/profile-calls-in-included-file-expected.txt:
* fast/profiler/profile-with-no-title-expected.txt:
* fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting-expected.txt:
* fast/profiler/profiling-from-a-nested-location-expected.txt:
* fast/profiler/simple-event-call-expected.txt:
* fast/profiler/simple-no-level-change-expected.txt:
* fast/profiler/start-and-stop-profiler-multiple-times-expected.txt:
* fast/profiler/start-and-stop-profiling-in-the-same-function-expected.txt:
* fast/profiler/stop-profiling-after-setTimeout-expected.txt:
* fast/profiler/stop-then-function-call-expected.txt:
* fast/profiler/two-execution-contexts-expected.txt:
* fast/profiler/user-defined-function-calls-built-in-functions-expected.txt:
* fast/profiler/window-dot-eval-expected.txt:
* js/dom/script-start-end-locations-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymouseventhandlerexpectedtxt">trunk/LayoutTests/fast/profiler/anonymous-event-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymousfunctioncalledfromdifferentcontextsexpectedtxt">trunk/LayoutTests/fast/profiler/anonymous-function-called-from-different-contexts-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymousfunctioncallsbuiltinfunctionsexpectedtxt">trunk/LayoutTests/fast/profiler/anonymous-function-calls-built-in-functions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymousfunctioncallsevalexpectedtxt">trunk/LayoutTests/fast/profiler/anonymous-function-calls-eval-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofileranonymousfunctionswithdisplaynamesexpectedtxt">trunk/LayoutTests/fast/profiler/anonymous-functions-with-display-names-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerapplyexpectedtxt">trunk/LayoutTests/fast/profiler/apply-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerbuiltinfunctioncallsanonymousexpectedtxt">trunk/LayoutTests/fast/profiler/built-in-function-calls-anonymous-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerbuiltinfunctioncallsuserdefinedfunctionexpectedtxt">trunk/LayoutTests/fast/profiler/built-in-function-calls-user-defined-function-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilercallexpectedtxt">trunk/LayoutTests/fast/profiler/call-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilercallingthefunctionthatstartedtheprofilerfromanotherscopeexpectedtxt">trunk/LayoutTests/fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilercomparemultipleprofilesexpectedtxt">trunk/LayoutTests/fast/profiler/compare-multiple-profiles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerconstructorexpectedtxt">trunk/LayoutTests/fast/profiler/constructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerdeadtimeexpectedtxt">trunk/LayoutTests/fast/profiler/dead-time-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerdocumentdotwriteexpectedtxt">trunk/LayoutTests/fast/profiler/document-dot-write-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilereventhandlerexpectedtxt">trunk/LayoutTests/fast/profiler/event-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerexecutioncontextandevalonsamelineexpectedtxt">trunk/LayoutTests/fast/profiler/execution-context-and-eval-on-same-line-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerinlineeventhandlerexpectedtxt">trunk/LayoutTests/fast/profiler/inline-event-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilermanycallsinthesamescopeexpectedtxt">trunk/LayoutTests/fast/profiler/many-calls-in-the-same-scope-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilermultipleanddifferentscopedanonymousfunctioncallsexpectedtxt">trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-anonymous-function-calls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilermultipleanddifferentscopedfunctioncallsexpectedtxt">trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-function-calls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilermultipleanonymousfunctionscalledfromthesamefunctionexpectedtxt">trunk/LayoutTests/fast/profiler/multiple-anonymous-functions-called-from-the-same-function-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilermultipleframesexpectedtxt">trunk/LayoutTests/fast/profiler/multiple-frames-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilernamedfunctionswithdisplaynamesexpectedtxt">trunk/LayoutTests/fast/profiler/named-functions-with-display-names-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilernestedanonymousfunctonexpectedtxt">trunk/LayoutTests/fast/profiler/nested-anonymous-functon-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilernestedstartandstopprofilerexpectedtxt">trunk/LayoutTests/fast/profiler/nested-start-and-stop-profiler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofileroneexecutioncontextexpectedtxt">trunk/LayoutTests/fast/profiler/one-execution-context-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerprofilecallsinincludedfileexpectedtxt">trunk/LayoutTests/fast/profiler/profile-calls-in-included-file-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerprofilewithnotitleexpectedtxt">trunk/LayoutTests/fast/profiler/profile-with-no-title-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerprofilingfromanestedlocationbutstopprofilingoutsidethenestingexpectedtxt">trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerprofilingfromanestedlocationexpectedtxt">trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilersimpleeventcallexpectedtxt">trunk/LayoutTests/fast/profiler/simple-event-call-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilersimplenolevelchangeexpectedtxt">trunk/LayoutTests/fast/profiler/simple-no-level-change-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerstartandstopprofilermultipletimesexpectedtxt">trunk/LayoutTests/fast/profiler/start-and-stop-profiler-multiple-times-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerstartandstopprofilinginthesamefunctionexpectedtxt">trunk/LayoutTests/fast/profiler/start-and-stop-profiling-in-the-same-function-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerstopprofilingaftersetTimeoutexpectedtxt">trunk/LayoutTests/fast/profiler/stop-profiling-after-setTimeout-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerstopthenfunctioncallexpectedtxt">trunk/LayoutTests/fast/profiler/stop-then-function-call-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilertwoexecutioncontextsexpectedtxt">trunk/LayoutTests/fast/profiler/two-execution-contexts-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofileruserdefinedfunctioncallsbuiltinfunctionsexpectedtxt">trunk/LayoutTests/fast/profiler/user-defined-function-calls-built-in-functions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastprofilerwindowdotevalexpectedtxt">trunk/LayoutTests/fast/profiler/window-dot-eval-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomscriptstartendlocationsexpectedtxt">trunk/LayoutTests/js/dom/script-start-end-locations-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSScriptRefcpp">trunk/Source/JavaScriptCore/API/JSScriptRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsBuiltinExecutablescpp">trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserLexercpp">trunk/Source/JavaScriptCore/parser/Lexer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserLexerh">trunk/Source/JavaScriptCore/parser/Lexer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodeConstructorsh">trunk/Source/JavaScriptCore/parser/NodeConstructors.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodescpp">trunk/Source/JavaScriptCore/parser/Nodes.cpp</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="#trunkSourceJavaScriptCoreparserParserFunctionInfoh">trunk/Source/JavaScriptCore/parser/ParserFunctionInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserModesh">trunk/Source/JavaScriptCore/parser/ParserModes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceCodeh">trunk/Source/JavaScriptCore/parser/SourceCode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceProviderCacheh">trunk/Source/JavaScriptCore/parser/SourceProviderCache.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSourceProviderCacheItemh">trunk/Source/JavaScriptCore/parser/SourceProviderCacheItem.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSyntaxCheckerh">trunk/Source/JavaScriptCore/parser/SyntaxChecker.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCachecpp">trunk/Source/JavaScriptCore/runtime/CodeCache.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCompletioncpp">trunk/Source/JavaScriptCore/runtime/Completion.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutablecpp">trunk/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestscontrolFlowProfilerconditionalexpressionjs">trunk/Source/JavaScriptCore/tests/controlFlowProfiler/conditional-expression.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/ChangeLog 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2015-07-17 Saam barati <saambarati1@gmail.com>
+
+ Function parameters should be parsed in the same parser arena as the function body
+ https://bugs.webkit.org/show_bug.cgi?id=145995
+
+ Reviewed by Yusuke Suzuki.
+
+ * fast/profiler/anonymous-event-handler-expected.txt:
+ * fast/profiler/anonymous-function-called-from-different-contexts-expected.txt:
+ * fast/profiler/anonymous-function-calls-built-in-functions-expected.txt:
+ * fast/profiler/anonymous-function-calls-eval-expected.txt:
+ * fast/profiler/anonymous-functions-with-display-names-expected.txt:
+ * fast/profiler/apply-expected.txt:
+ * fast/profiler/built-in-function-calls-anonymous-expected.txt:
+ * fast/profiler/built-in-function-calls-user-defined-function-expected.txt:
+ * fast/profiler/call-expected.txt:
+ * fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope-expected.txt:
+ * fast/profiler/compare-multiple-profiles-expected.txt:
+ * fast/profiler/constructor-expected.txt:
+ * fast/profiler/dead-time-expected.txt:
+ * fast/profiler/document-dot-write-expected.txt:
+ * fast/profiler/event-handler-expected.txt:
+ * fast/profiler/execution-context-and-eval-on-same-line-expected.txt:
+ * fast/profiler/inline-event-handler-expected.txt:
+ * fast/profiler/many-calls-in-the-same-scope-expected.txt:
+ * fast/profiler/multiple-and-different-scoped-anonymous-function-calls-expected.txt:
+ * fast/profiler/multiple-and-different-scoped-function-calls-expected.txt:
+ * fast/profiler/multiple-anonymous-functions-called-from-the-same-function-expected.txt:
+ * fast/profiler/multiple-frames-expected.txt:
+ * fast/profiler/named-functions-with-display-names-expected.txt:
+ * fast/profiler/nested-anonymous-functon-expected.txt:
+ * fast/profiler/nested-start-and-stop-profiler-expected.txt:
+ * fast/profiler/one-execution-context-expected.txt:
+ * fast/profiler/profile-calls-in-included-file-expected.txt:
+ * fast/profiler/profile-with-no-title-expected.txt:
+ * fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting-expected.txt:
+ * fast/profiler/profiling-from-a-nested-location-expected.txt:
+ * fast/profiler/simple-event-call-expected.txt:
+ * fast/profiler/simple-no-level-change-expected.txt:
+ * fast/profiler/start-and-stop-profiler-multiple-times-expected.txt:
+ * fast/profiler/start-and-stop-profiling-in-the-same-function-expected.txt:
+ * fast/profiler/stop-profiling-after-setTimeout-expected.txt:
+ * fast/profiler/stop-then-function-call-expected.txt:
+ * fast/profiler/two-execution-contexts-expected.txt:
+ * fast/profiler/user-defined-function-calls-built-in-functions-expected.txt:
+ * fast/profiler/window-dot-eval-expected.txt:
+ * js/dom/script-start-end-locations-expected.txt:
+
</ins><span class="cx"> 2015-07-17 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] CSS-display-none rules are not working properly
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymouseventhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-event-handler-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-event-handler-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/anonymous-event-handler-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,15 +4,15 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Anonymous event handler
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest anonymous-event-handler.html (line 11:1)
</del><ins>+ startTest anonymous-event-handler.html (line 10:19)
</ins><span class="cx"> getElementById (no file) (line 0:0)
</span><span class="cx"> click (no file) (line 0:0)
</span><del>- onclick anonymous-event-handler.html (line 15:54)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ onclick anonymous-event-handler.html (line 15:51)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymousfunctioncalledfromdifferentcontextsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-function-called-from-different-contexts-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-function-called-from-different-contexts-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/anonymous-function-called-from-different-contexts-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,21 +4,21 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Same anonymous function called from different contexts
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest anonymous-function-called-from-different-contexts.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest anonymous-function-called-from-different-contexts.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><span class="cx"> eval (no file) (line 0:0)
</span><span class="cx"> (program) (no file) (line 1:1)
</span><del>- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymousfunctioncallsbuiltinfunctionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-function-calls-built-in-functions-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-function-calls-built-in-functions-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/anonymous-function-calls-built-in-functions-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Anonymous function calls built-in functions
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest anonymous-function-calls-built-in-functions.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest anonymous-function-calls-built-in-functions.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymousfunctioncallsevalexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-function-calls-eval-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-function-calls-eval-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/anonymous-function-calls-eval-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,15 +4,15 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Anonymous function calles eval
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest anonymous-function-calls-eval.html (line 11:1)
- variableThatPointsToAnAnonymousFunction anonymous-function-calls-eval.html (line 14:62)
</del><ins>+ startTest anonymous-function-calls-eval.html (line 10:19)
+ variableThatPointsToAnAnonymousFunction anonymous-function-calls-eval.html (line 14:59)
</ins><span class="cx"> eval (no file) (line 0:0)
</span><span class="cx"> (program) (no file) (line 1:1)
</span><del>- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileranonymousfunctionswithdisplaynamesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/anonymous-functions-with-display-names-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/anonymous-functions-with-display-names-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/anonymous-functions-with-display-names-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Anonymous functions with display names
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest anonymous-functions-with-display-names.html (line 23:1)
- anonymousFunctionGenerator anonymous-functions-with-display-names.html (line 11:1)
- 0 iterations function anonymous-functions-with-display-names.html (line 13:5)
- 1 iterations function anonymous-functions-with-display-names.html (line 13:5)
- 2 iterations function anonymous-functions-with-display-names.html (line 13:5)
- 20 iterations function anonymous-functions-with-display-names.html (line 13:5)
- 1000 iterations function anonymous-functions-with-display-names.html (line 13:5)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest anonymous-functions-with-display-names.html (line 22:19)
+ anonymousFunctionGenerator anonymous-functions-with-display-names.html (line 10:36)
+ 0 iterations function anonymous-functions-with-display-names.html (line 12:59)
+ 1 iterations function anonymous-functions-with-display-names.html (line 12:59)
+ 2 iterations function anonymous-functions-with-display-names.html (line 12:59)
+ 20 iterations function anonymous-functions-with-display-names.html (line 12:59)
+ 1000 iterations function anonymous-functions-with-display-names.html (line 12:59)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerapplyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/apply-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/apply-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/apply-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Using the apply() method
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest apply.html (line 11:1)
- fakeObject apply.html (line 18:1)
- fakeInteriorFunction apply.html (line 24:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest apply.html (line 10:19)
+ fakeObject apply.html (line 17:21)
+ fakeInteriorFunction apply.html (line 23:30)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerbuiltinfunctioncallsanonymousexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/built-in-function-calls-anonymous-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/built-in-function-calls-anonymous-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/built-in-function-calls-anonymous-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Built-in function calls an anonymous function
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest built-in-function-calls-anonymous.html (line 11:1)
</del><ins>+ startTest built-in-function-calls-anonymous.html (line 10:19)
</ins><span class="cx"> Array (no file) (line 0:0)
</span><span class="cx"> map (no file) (line 0:0)
</span><span class="cx"> Object (no file) (line 0:0)
</span><span class="lines">@@ -12,8 +12,8 @@
</span><span class="cx"> toInteger (no file) (line 0:0)
</span><span class="cx"> Number (no file) (line 0:0)
</span><span class="cx"> (anonymous function) (no file) (line 0:0)
</span><del>- myFunction built-in-function-calls-anonymous.html (line 14:45)
- arrayOperatorFunction profiler-test-JS-resources.js (line 25:46)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ myFunction built-in-function-calls-anonymous.html (line 14:30)
+ arrayOperatorFunction profiler-test-JS-resources.js (line 25:31)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerbuiltinfunctioncallsuserdefinedfunctionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/built-in-function-calls-user-defined-function-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/built-in-function-calls-user-defined-function-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/built-in-function-calls-user-defined-function-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Built-in function calls a user defined function
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest built-in-function-calls-user-defined-function.html (line 11:1)
</del><ins>+ startTest built-in-function-calls-user-defined-function.html (line 10:19)
</ins><span class="cx"> Array (no file) (line 0:0)
</span><span class="cx"> map (no file) (line 0:0)
</span><span class="cx"> Object (no file) (line 0:0)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> toInteger (no file) (line 0:0)
</span><span class="cx"> Number (no file) (line 0:0)
</span><span class="cx"> (anonymous function) (no file) (line 0:0)
</span><del>- arrayOperatorFunction profiler-test-JS-resources.js (line 25:46)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ arrayOperatorFunction profiler-test-JS-resources.js (line 25:31)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilercallexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/call-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/call-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/call-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Using the call() method
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest call.html (line 11:1)
- fakeObject call.html (line 20:1)
- fakeInteriorFunction call.html (line 26:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest call.html (line 10:19)
+ fakeObject call.html (line 19:21)
+ fakeInteriorFunction call.html (line 25:30)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilercallingthefunctionthatstartedtheprofilerfromanotherscopeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/calling-the-function-that-started-the-profiler-from-another-scope-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Calling the same function where the profile started from another function
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- indirection calling-the-function-that-started-the-profiler-from-another-scope.html (line 18:1)
- functionWichStartsAndStopsTheProfiler calling-the-function-that-started-the-profiler-from-another-scope.html (line 24:1)
- functionWichStartsAndStopsTheProfiler calling-the-function-that-started-the-profiler-from-another-scope.html (line 24:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ indirection calling-the-function-that-started-the-profiler-from-another-scope.html (line 17:21)
+ functionWichStartsAndStopsTheProfiler calling-the-function-that-started-the-profiler-from-another-scope.html (line 23:47)
+ functionWichStartsAndStopsTheProfiler calling-the-function-that-started-the-profiler-from-another-scope.html (line 23:47)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilercomparemultipleprofilesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/compare-multiple-profiles-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/compare-multiple-profiles-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/compare-multiple-profiles-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,14 +4,14 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Test
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest compare-multiple-profiles.html (line 23:1)
- test compare-multiple-profiles.html (line 11:20)
- test2 compare-multiple-profiles.html (line 17:21)
</del><ins>+ startTest compare-multiple-profiles.html (line 22:19)
+ test compare-multiple-profiles.html (line 11:14)
+ test2 compare-multiple-profiles.html (line 17:15)
</ins><span class="cx">
</span><span class="cx"> Profile title: Test
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest compare-multiple-profiles.html (line 23:1)
- test compare-multiple-profiles.html (line 11:20)
- test2 compare-multiple-profiles.html (line 17:21)
</del><ins>+ startTest compare-multiple-profiles.html (line 22:19)
+ test compare-multiple-profiles.html (line 11:14)
+ test2 compare-multiple-profiles.html (line 17:15)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/constructor-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/constructor-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/constructor-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Using a constructor.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest constructor.html (line 11:1)
- fakeObject constructor.html (line 20:1)
</del><ins>+ startTest constructor.html (line 10:19)
+ fakeObject constructor.html (line 19:21)
</ins><span class="cx"> Array (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerdeadtimeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/dead-time-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/dead-time-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/dead-time-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,10 +4,10 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Dead time in profile.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- onload dead-time.html (line 21:52)
- startTest dead-time.html (line 13:1)
</del><ins>+ onload dead-time.html (line 21:44)
+ startTest dead-time.html (line 12:19)
</ins><span class="cx"> setTimeout (no file) (line 0:0)
</span><span class="cx"> (program) dead-time.html (line 1:1)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerdocumentdotwriteexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/document-dot-write-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/document-dot-write-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/document-dot-write-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Call Document.write()
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest document-dot-write.html (line 11:1)
</del><ins>+ startTest document-dot-write.html (line 10:19)
</ins><span class="cx"> write (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilereventhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/event-handler-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/event-handler-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/event-handler-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,15 +4,15 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Event handler
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest event-handler.html (line 11:1)
</del><ins>+ startTest event-handler.html (line 10:19)
</ins><span class="cx"> getElementById (no file) (line 0:0)
</span><span class="cx"> addEventListener (no file) (line 0:0)
</span><span class="cx"> click (no file) (line 0:0)
</span><del>- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerexecutioncontextandevalonsamelineexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/execution-context-and-eval-on-same-line-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/execution-context-and-eval-on-same-line-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/execution-context-and-eval-on-same-line-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Two Execution Contexts on the same line
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest execution-context-and-eval-on-same-line.html (line 11:1)
- evalFunction (no file) (line 1:25)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest execution-context-and-eval-on-same-line.html (line 10:19)
+ evalFunction (no file) (line 1:22)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerinlineeventhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/inline-event-handler-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/inline-event-handler-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/inline-event-handler-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,17 +4,17 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Inline event handler
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest inline-event-handler.html (line 11:1)
</del><ins>+ startTest inline-event-handler.html (line 10:19)
</ins><span class="cx"> getElementById (no file) (line 0:0)
</span><span class="cx"> click (no file) (line 0:0)
</span><del>- onclick inline-event-handler.html (line 31:135)
- eventListener inline-event-handler.html (line 17:26)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ onclick inline-event-handler.html (line 31:127)
+ eventListener inline-event-handler.html (line 17:23)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermanycallsinthesamescopeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/many-calls-in-the-same-scope-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/many-calls-in-the-same-scope-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/many-calls-in-the-same-scope-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,33 +4,33 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Many Calls In The Same Scope
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest many-calls-in-the-same-scope.html (line 11:1)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest many-calls-in-the-same-scope.html (line 10:19)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- insertGivenText profiler-test-JS-resources.js (line 9:32)
</del><ins>+ insertGivenText profiler-test-JS-resources.js (line 9:25)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- arrayOperatorFunction profiler-test-JS-resources.js (line 25:46)
- intermediaryFunction profiler-test-JS-resources.js (line 33:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ arrayOperatorFunction profiler-test-JS-resources.js (line 25:31)
+ intermediaryFunction profiler-test-JS-resources.js (line 32:30)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- end many-calls-in-the-same-scope.html (line 27:1)
- endT many-calls-in-the-same-scope.html (line 32:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ end many-calls-in-the-same-scope.html (line 26:13)
+ endT many-calls-in-the-same-scope.html (line 31:14)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermultipleanddifferentscopedanonymousfunctioncallsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-anonymous-function-calls-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-anonymous-function-calls-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-anonymous-function-calls-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,20 +4,20 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Multiple and different scoped calls to the same anonymous function
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest multiple-and-different-scoped-anonymous-function-calls.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest multiple-and-different-scoped-anonymous-function-calls.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- intermediaryFunction profiler-test-JS-resources.js (line 33:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ intermediaryFunction profiler-test-JS-resources.js (line 32:30)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermultipleanddifferentscopedfunctioncallsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-function-calls-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-function-calls-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/multiple-and-different-scoped-function-calls-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,19 +4,19 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Multiple and different scoped calls to the same function
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest multiple-and-different-scoped-function-calls.html (line 11:1)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest multiple-and-different-scoped-function-calls.html (line 10:19)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- intermediaryFunction profiler-test-JS-resources.js (line 33:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ intermediaryFunction profiler-test-JS-resources.js (line 32:30)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermultipleanonymousfunctionscalledfromthesamefunctionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/multiple-anonymous-functions-called-from-the-same-function-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/multiple-anonymous-functions-called-from-the-same-function-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/multiple-anonymous-functions-called-from-the-same-function-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,19 +4,19 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Multiple calls to different anonymous functions
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest multiple-anonymous-functions-called-from-the-same-function.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest multiple-anonymous-functions-called-from-the-same-function.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- anotherAnonymousFunction profiler-test-JS-resources.js (line 30:44)
- insertGivenText profiler-test-JS-resources.js (line 9:32)
</del><ins>+ anotherAnonymousFunction profiler-test-JS-resources.js (line 30:41)
+ insertGivenText profiler-test-JS-resources.js (line 9:25)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilermultipleframesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/multiple-frames-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/multiple-frames-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/multiple-frames-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,15 +4,15 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Other window executing JavaScript
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest multiple-frames.html (line 11:1)
</del><ins>+ startTest multiple-frames.html (line 10:19)
</ins><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- functionInOtherFrame other-frame.html (line 4:33)
- functionInParentFrame multiple-frames.html (line 21:34)
- insertGivenText profiler-test-JS-resources.js (line 9:32)
</del><ins>+ functionInOtherFrame other-frame.html (line 4:30)
+ functionInParentFrame multiple-frames.html (line 21:31)
+ insertGivenText profiler-test-JS-resources.js (line 9:25)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilernamedfunctionswithdisplaynamesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/named-functions-with-display-names-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/named-functions-with-display-names-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/named-functions-with-display-names-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Named functions with display names
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest named-functions-with-display-names.html (line 54:1)
- 0 iterations function named-functions-with-display-names.html (line 11:1)
- 1 iteration function named-functions-with-display-names.html (line 18:1)
- 2 iterations function named-functions-with-display-names.html (line 25:1)
- 20 iterations function named-functions-with-display-names.html (line 32:1)
- 1000 iterations function named-functions-with-display-names.html (line 39:1)
- bogusDisplayNameFunction named-functions-with-display-names.html (line 47:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest named-functions-with-display-names.html (line 53:19)
+ 0 iterations function named-functions-with-display-names.html (line 10:19)
+ 1 iteration function named-functions-with-display-names.html (line 17:19)
+ 2 iterations function named-functions-with-display-names.html (line 24:19)
+ 20 iterations function named-functions-with-display-names.html (line 31:20)
+ 1000 iterations function named-functions-with-display-names.html (line 38:22)
+ bogusDisplayNameFunction named-functions-with-display-names.html (line 46:34)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilernestedanonymousfunctonexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/nested-anonymous-functon-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/nested-anonymous-functon-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/nested-anonymous-functon-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,14 +4,14 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Nested anonymous functions called
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest nested-anonymous-functon.html (line 11:1)
- AnonymousFunctionWichCallsAnAnonymousFunction nested-anonymous-functon.html (line 14:68)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest nested-anonymous-functon.html (line 10:19)
+ AnonymousFunctionWichCallsAnAnonymousFunction nested-anonymous-functon.html (line 14:65)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilernestedstartandstopprofilerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/nested-start-and-stop-profiler-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/nested-start-and-stop-profiler-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/nested-start-and-stop-profiler-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,35 +4,35 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the third time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest nested-start-and-stop-profiler.html (line 11:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest nested-start-and-stop-profiler.html (line 10:19)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the third time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest nested-start-and-stop-profiler.html (line 11:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest nested-start-and-stop-profiler.html (line 10:19)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the second time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest nested-start-and-stop-profiler.html (line 11:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest nested-start-and-stop-profiler.html (line 10:19)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx"> profileEnd (no file) (line 0:0)
</span><del>- printProfilesDataWithoutTime profiler-test-JS-resources.js (line 63:1)
</del><ins>+ printProfilesDataWithoutTime profiler-test-JS-resources.js (line 62:38)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="lines">@@ -43,29 +43,29 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the third time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest nested-start-and-stop-profiler.html (line 11:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest nested-start-and-stop-profiler.html (line 10:19)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the second time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest nested-start-and-stop-profiler.html (line 11:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest nested-start-and-stop-profiler.html (line 10:19)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx"> profileEnd (no file) (line 0:0)
</span><del>- printProfilesDataWithoutTime profiler-test-JS-resources.js (line 63:1)
</del><ins>+ printProfilesDataWithoutTime profiler-test-JS-resources.js (line 62:38)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="lines">@@ -75,49 +75,49 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the first time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest nested-start-and-stop-profiler.html (line 11:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest nested-start-and-stop-profiler.html (line 10:19)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx"> profileEnd (no file) (line 0:0)
</span><del>- printProfilesDataWithoutTime profiler-test-JS-resources.js (line 63:1)
</del><ins>+ printProfilesDataWithoutTime profiler-test-JS-resources.js (line 62:38)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> children (no file) (line 0:0)
</span><del>- printProfileNodeWithoutTime profiler-test-JS-resources.js (line 78:1)
</del><ins>+ printProfileNodeWithoutTime profiler-test-JS-resources.js (line 77:37)
</ins><span class="cx"> replace (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileroneexecutioncontextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/one-execution-context-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/one-execution-context-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/one-execution-context-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title: One Execution Context
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest one-execution-context.html (line 11:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest one-execution-context.html (line 10:19)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerprofilecallsinincludedfileexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/profile-calls-in-included-file-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/profile-calls-in-included-file-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/profile-calls-in-included-file-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Profile call in included file
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startProfile profiler-test-JS-resources.js (line 43:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startProfile profiler-test-JS-resources.js (line 42:22)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerprofilewithnotitleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/profile-with-no-title-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/profile-with-no-title-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/profile-with-no-title-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title:
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest profile-with-no-title.html (line 11:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest profile-with-no-title.html (line 10:19)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerprofilingfromanestedlocationbutstopprofilingoutsidethenestingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Profiling From A Nested Location But Stop Profiling Outside The Nesting
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- functionWichStartsTheProfiler profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html (line 17:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ functionWichStartsTheProfiler profiling-from-a-nested-location-but-stop-profiling-outside-the-nesting.html (line 16:39)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerprofilingfromanestedlocationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/profiling-from-a-nested-location-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Profiling From A Nested Location
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- functionWichStartsAndStopsTheProfiler profiling-from-a-nested-location.html (line 16:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ functionWichStartsAndStopsTheProfiler profiling-from-a-nested-location.html (line 15:47)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilersimpleeventcallexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/simple-event-call-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/simple-event-call-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/simple-event-call-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title: A simple profile test where an event happens.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest simple-event-call.html (line 11:1)
- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ startTest simple-event-call.html (line 10:19)
+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilersimplenolevelchangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/simple-no-level-change-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/simple-no-level-change-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/simple-no-level-change-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title: A simple profile test where no scope chagnes
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- functionWichStartsAndStopsTheProfiler simple-no-level-change.html (line 16:1)
</del><ins>+ functionWichStartsAndStopsTheProfiler simple-no-level-change.html (line 15:47)
</ins><span class="cx"> getElementById (no file) (line 0:0)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerstartandstopprofilermultipletimesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/start-and-stop-profiler-multiple-times-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/start-and-stop-profiler-multiple-times-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/start-and-stop-profiler-multiple-times-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,70 +4,70 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the first time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest start-and-stop-profiler-multiple-times.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest start-and-stop-profiler-multiple-times.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the first time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest start-and-stop-profiler-multiple-times.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest start-and-stop-profiler-multiple-times.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the second time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest start-and-stop-profiler-multiple-times.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest start-and-stop-profiler-multiple-times.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the first time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest start-and-stop-profiler-multiple-times.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest start-and-stop-profiler-multiple-times.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the second time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest start-and-stop-profiler-multiple-times.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest start-and-stop-profiler-multiple-times.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx"> Profile title: Start the profiler the third time.
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest start-and-stop-profiler-multiple-times.html (line 11:1)
- anonymousFunction profiler-test-JS-resources.js (line 29:37)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest start-and-stop-profiler-multiple-times.html (line 10:19)
+ anonymousFunction profiler-test-JS-resources.js (line 29:34)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerstartandstopprofilinginthesamefunctionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/start-and-stop-profiling-in-the-same-function-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/start-and-stop-profiling-in-the-same-function-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/start-and-stop-profiling-in-the-same-function-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Profiling From A Nested Location
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest start-and-stop-profiling-in-the-same-function.html (line 11:1)
- functionWichStopsTheProfiler start-and-stop-profiling-in-the-same-function.html (line 18:1)
</del><ins>+ startTest start-and-stop-profiling-in-the-same-function.html (line 10:19)
+ functionWichStopsTheProfiler start-and-stop-profiling-in-the-same-function.html (line 17:38)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerstopprofilingaftersetTimeoutexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/stop-profiling-after-setTimeout-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/stop-profiling-after-setTimeout-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/stop-profiling-after-setTimeout-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,10 +4,10 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Stop profiling from a timeout
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- onload stop-profiling-after-setTimeout.html (line 21:52)
- startTest stop-profiling-after-setTimeout.html (line 13:1)
</del><ins>+ onload stop-profiling-after-setTimeout.html (line 21:44)
+ startTest stop-profiling-after-setTimeout.html (line 12:19)
</ins><span class="cx"> setTimeout (no file) (line 0:0)
</span><span class="cx"> (program) stop-profiling-after-setTimeout.html (line 1:1)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerstopthenfunctioncallexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/stop-then-function-call-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/stop-then-function-call-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/stop-then-function-call-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -5,6 +5,6 @@
</span><span class="cx"> Profile title: Test
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><span class="cx"> (program) (no file) (line 1:16)
</span><del>- test stop-then-function-call.html (line 11:20)
</del><ins>+ test stop-then-function-call.html (line 11:14)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilertwoexecutioncontextsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/two-execution-contexts-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/two-execution-contexts-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/two-execution-contexts-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Two Execution Contexts
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest two-execution-contexts.html (line 11:1)
- intermediaryFunction two-execution-contexts.html (line 18:1)
- testEnd two-execution-contexts.html (line 33:20)
</del><ins>+ startTest two-execution-contexts.html (line 10:19)
+ intermediaryFunction two-execution-contexts.html (line 17:30)
+ testEnd two-execution-contexts.html (line 33:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofileruserdefinedfunctioncallsbuiltinfunctionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/user-defined-function-calls-built-in-functions-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/user-defined-function-calls-built-in-functions-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/user-defined-function-calls-built-in-functions-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -6,11 +6,11 @@
</span><span class="cx">
</span><span class="cx"> Profile title: User defined function calles built-in functions
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest user-defined-function-calls-built-in-functions.html (line 11:1)
</del><ins>+ startTest user-defined-function-calls-built-in-functions.html (line 10:19)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastprofilerwindowdotevalexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/profiler/window-dot-eval-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/profiler/window-dot-eval-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/fast/profiler/window-dot-eval-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx">
</span><span class="cx"> Profile title: Call window.eval()
</span><span class="cx"> Thread_1 (no file) (line 0:0)
</span><del>- startTest window-dot-eval.html (line 11:1)
- evalFunction (no file) (line 1:25)
- insertNewText profiler-test-JS-resources.js (line 17:26)
</del><ins>+ startTest window-dot-eval.html (line 10:19)
+ evalFunction (no file) (line 1:22)
+ insertNewText profiler-test-JS-resources.js (line 17:23)
</ins><span class="cx"> createElement (no file) (line 0:0)
</span><span class="cx"> createTextNode (no file) (line 0:0)
</span><span class="cx"> appendChild (no file) (line 0:0)
</span><span class="cx"> getElementById (no file) (line 0:0)
</span><del>- endTest profiler-test-JS-resources.js (line 1:20)
</del><ins>+ endTest profiler-test-JS-resources.js (line 1:17)
</ins><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomscriptstartendlocationsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/script-start-end-locations-expected.txt (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/script-start-end-locations-expected.txt 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/LayoutTests/js/dom/script-start-end-locations-expected.txt 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -5,273 +5,273 @@
</span><span class="cx"> program { 23:68 - 23:109 }
</span><span class="cx"> program { 25:9 - 26:1 }
</span><span class="cx"> program { 27:13 - 28:1 }
</span><del>-function "hf1" { 30:24 - 30:38 }
-function "hf2" { 31:28 - 31:42 }
-function "hf3" { 32:32 - 32:46 }
-function "hf4" { 34:24 - 36:9 }
-function "hf5" { 37:28 - 39:9 }
-function "hf6" { 40:32 - 42:9 }
-function "hf7" { 45:16 - 47:5 }
-function "hf8" { 49:35 - 49:45 }
-function "hf9" { 49:97 - 49:107 }
</del><ins>+function "hf1" { 30:21 - 30:38 }
+function "hf2" { 31:25 - 31:42 }
+function "hf3" { 32:29 - 32:46 }
+function "hf4" { 34:21 - 36:9 }
+function "hf5" { 37:25 - 39:9 }
+function "hf6" { 40:29 - 42:9 }
+function "hf7" { 45:13 - 47:5 }
+function "hf8" { 49:32 - 49:45 }
+function "hf9" { 49:94 - 49:107 }
</ins><span class="cx">
</span><span class="cx"> program { 1:1 - 474:1 }
</span><span class="cx">
</span><span class="cx"> On first line:
</span><del>-function "f0" { 1:115 - 1:266 }
-function "f0a" { 1:142 - 1:257 }
-function "f0b" { 1:170 - 1:248 }
</del><ins>+function "f0" { 1:112 - 1:266 }
+function "f0a" { 1:139 - 1:257 }
+function "f0b" { 1:167 - 1:248 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "x0" { 1:298 - 1:476 }
-function "x0a" { 1:330 - 1:466 }
-function "x0b" { 1:364 - 1:456 }
</del><ins>+function "x0" { 1:292 - 1:476 }
+function "x0a" { 1:327 - 1:466 }
+function "x0b" { 1:361 - 1:456 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Functions Declarations in a function:
</span><del>-function "f1" { 9:22 - 9:113 }
</del><ins>+function "f1" { 9:16 - 9:113 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "f2" { 12:22 - 16:5 }
-function "f2a" { 14:24 - 14:116 }
</del><ins>+function "f2" { 12:16 - 16:5 }
+function "f2a" { 14:21 - 14:116 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "f3" { 19:22 - 31:5 }
-function "f3a" { 21:24 - 29:9 }
-function "f3b" { 23:28 - 27:13 }
</del><ins>+function "f3" { 19:16 - 31:5 }
+function "f3a" { 21:21 - 29:9 }
+function "f3b" { 23:25 - 27:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "f4" { 34:22 - 34:71 }
-function "f4a" { 34:49 - 34:50 }
-function "f5" { 36:22 - 36:151 }
-function "f5a" { 36:49 - 36:141 }
</del><ins>+function "f4" { 34:16 - 34:71 }
+function "f4a" { 34:46 - 34:50 }
+function "f5" { 36:16 - 36:151 }
+function "f5a" { 36:46 - 36:141 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "f6" { 38:22 - 38:189 }
-function "f6a" { 38:49 - 38:179 }
-function "f6b" { 38:77 - 38:169 }
</del><ins>+function "f6" { 38:16 - 38:189 }
+function "f6a" { 38:46 - 38:179 }
+function "f6b" { 38:74 - 38:169 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Indented Functions Declarations in a function:
</span><del>-function "fi1" { 43:27 - 43:119 }
</del><ins>+function "fi1" { 43:21 - 43:119 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "fi2" { 46:27 - 50:9 }
-function "fi2a" { 48:29 - 48:122 }
</del><ins>+function "fi2" { 46:21 - 50:9 }
+function "fi2a" { 48:26 - 48:122 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "fi3" { 53:27 - 65:9 }
-function "fi3a" { 55:29 - 63:13 }
-function "fi3b" { 57:33 - 61:17 }
</del><ins>+function "fi3" { 53:21 - 65:9 }
+function "fi3a" { 55:26 - 63:13 }
+function "fi3b" { 57:30 - 61:17 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "fi4" { 68:27 - 68:80 }
-function "fi4a" { 68:56 - 68:57 }
-function "fi5" { 70:27 - 70:160 }
-function "fi5a" { 70:56 - 70:149 }
</del><ins>+function "fi4" { 68:21 - 68:80 }
+function "fi4a" { 68:53 - 68:57 }
+function "fi5" { 70:21 - 70:160 }
+function "fi5a" { 70:53 - 70:149 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "fi6" { 72:27 - 72:201 }
-function "fi6a" { 72:56 - 72:190 }
-function "fi6b" { 72:86 - 72:179 }
</del><ins>+function "fi6" { 72:21 - 72:201 }
+function "fi6a" { 72:53 - 72:190 }
+function "fi6b" { 72:83 - 72:179 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Functions Expressions in a function:
</span><del>-function "x1" { 77:28 - 77:119 }
</del><ins>+function "x1" { 77:22 - 77:119 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "x2" { 80:28 - 84:5 }
-function "x2a" { 82:30 - 82:122 }
</del><ins>+function "x2" { 80:22 - 84:5 }
+function "x2a" { 82:27 - 82:122 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "x3" { 87:28 - 99:5 }
-function "x3a" { 89:30 - 97:9 }
-function "x3b" { 91:34 - 95:13 }
</del><ins>+function "x3" { 87:22 - 99:5 }
+function "x3a" { 89:27 - 97:9 }
+function "x3b" { 91:31 - 95:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "x4" { 102:28 - 102:83 }
-function "x4a" { 102:61 - 102:62 }
-function "x5" { 104:28 - 104:163 }
-function "x5a" { 104:61 - 104:153 }
</del><ins>+function "x4" { 102:22 - 102:83 }
+function "x4a" { 102:58 - 102:62 }
+function "x5" { 104:22 - 104:163 }
+function "x5a" { 104:58 - 104:153 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "x6" { 106:28 - 106:207 }
-function "x6a" { 106:61 - 106:197 }
-function "x6b" { 106:95 - 106:187 }
</del><ins>+function "x6" { 106:22 - 106:207 }
+function "x6a" { 106:58 - 106:197 }
+function "x6b" { 106:92 - 106:187 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Indented Functions Expressions in a function:
</span><del>-function "xi1" { 111:33 - 111:125 }
</del><ins>+function "xi1" { 111:27 - 111:125 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "xi2" { 114:33 - 118:9 }
-function "xi2a" { 116:35 - 116:128 }
</del><ins>+function "xi2" { 114:27 - 118:9 }
+function "xi2a" { 116:32 - 116:128 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "xi3" { 121:33 - 133:9 }
-function "xi3a" { 123:35 - 131:13 }
-function "xi3b" { 125:39 - 129:17 }
</del><ins>+function "xi3" { 121:27 - 133:9 }
+function "xi3a" { 123:32 - 131:13 }
+function "xi3b" { 125:36 - 129:17 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "xi4" { 136:33 - 136:92 }
-function "xi4a" { 136:68 - 136:69 }
-function "xi5" { 138:33 - 138:172 }
-function "xi5a" { 138:68 - 138:161 }
</del><ins>+function "xi4" { 136:27 - 136:92 }
+function "xi4a" { 136:65 - 136:69 }
+function "xi5" { 138:27 - 138:172 }
+function "xi5a" { 138:65 - 138:161 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "xi6" { 140:33 - 140:219 }
-function "xi6a" { 140:68 - 140:208 }
-function "xi6b" { 140:104 - 140:197 }
</del><ins>+function "xi6" { 140:27 - 140:219 }
+function "xi6a" { 140:65 - 140:208 }
+function "xi6b" { 140:101 - 140:197 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Anonymous Function Declaration in a function:
</span><del>-function "" { 146:58 - 151:5 }
</del><ins>+function "" { 146:52 - 151:5 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Global eval:
</span><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Global Functions Declarations:
</span><del>-function "gf1" { 161:19 - 161:111 }
</del><ins>+function "gf1" { 161:13 - 161:111 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gf2" { 164:19 - 168:1 }
-function "gf2a" { 166:21 - 166:114 }
</del><ins>+function "gf2" { 164:13 - 168:1 }
+function "gf2a" { 166:18 - 166:114 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gf3" { 171:19 - 183:1 }
-function "gf3a" { 173:21 - 181:5 }
-function "gf3b" { 175:25 - 179:9 }
</del><ins>+function "gf3" { 171:13 - 183:1 }
+function "gf3a" { 173:18 - 181:5 }
+function "gf3b" { 175:22 - 179:9 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gf4" { 186:19 - 186:72 }
-function "gf4a" { 186:48 - 186:49 }
-function "gf5" { 188:19 - 188:152 }
-function "gf5a" { 188:48 - 188:141 }
</del><ins>+function "gf4" { 186:13 - 186:72 }
+function "gf4a" { 186:45 - 186:49 }
+function "gf5" { 188:13 - 188:152 }
+function "gf5a" { 188:45 - 188:141 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gf6" { 190:19 - 190:193 }
-function "gf6a" { 190:48 - 190:182 }
-function "gf6b" { 190:78 - 190:171 }
</del><ins>+function "gf6" { 190:13 - 190:193 }
+function "gf6a" { 190:45 - 190:182 }
+function "gf6b" { 190:75 - 190:171 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Indented Global Functions Declarations:
</span><del>-function "gfi1" { 195:24 - 195:117 }
</del><ins>+function "gfi1" { 195:18 - 195:117 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gfi2" { 198:24 - 202:5 }
-function "gfi2a" { 200:26 - 200:120 }
</del><ins>+function "gfi2" { 198:18 - 202:5 }
+function "gfi2a" { 200:23 - 200:120 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gfi3" { 205:24 - 217:5 }
-function "gfi3a" { 207:26 - 215:9 }
-function "gfi3b" { 209:30 - 213:13 }
</del><ins>+function "gfi3" { 205:18 - 217:5 }
+function "gfi3a" { 207:23 - 215:9 }
+function "gfi3b" { 209:27 - 213:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gfi4" { 220:24 - 220:81 }
-function "gfi4a" { 220:55 - 220:56 }
-function "gfi5" { 222:24 - 222:161 }
-function "gfi5a" { 222:55 - 222:149 }
</del><ins>+function "gfi4" { 220:18 - 220:81 }
+function "gfi4a" { 220:52 - 220:56 }
+function "gfi5" { 222:18 - 222:161 }
+function "gfi5a" { 222:52 - 222:149 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gfi6" { 224:24 - 224:205 }
-function "gfi6a" { 224:55 - 224:193 }
-function "gfi6b" { 224:87 - 224:181 }
</del><ins>+function "gfi6" { 224:18 - 224:205 }
+function "gfi6a" { 224:52 - 224:193 }
+function "gfi6b" { 224:84 - 224:181 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Global Functions Expressions:
</span><del>-function "gx1" { 229:25 - 229:117 }
</del><ins>+function "gx1" { 229:19 - 229:117 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gx2" { 232:25 - 236:1 }
-function "gx2a" { 234:27 - 234:120 }
</del><ins>+function "gx2" { 232:19 - 236:1 }
+function "gx2a" { 234:24 - 234:120 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gx3" { 239:25 - 251:1 }
-function "gx3a" { 241:27 - 249:5 }
-function "gx3b" { 243:31 - 247:9 }
</del><ins>+function "gx3" { 239:19 - 251:1 }
+function "gx3a" { 241:24 - 249:5 }
+function "gx3b" { 243:28 - 247:9 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gx4" { 254:25 - 254:84 }
-function "gx4a" { 254:60 - 254:61 }
-function "gx5" { 256:25 - 256:164 }
-function "gx5a" { 256:60 - 256:153 }
</del><ins>+function "gx4" { 254:19 - 254:84 }
+function "gx4a" { 254:57 - 254:61 }
+function "gx5" { 256:19 - 256:164 }
+function "gx5a" { 256:57 - 256:153 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gx6" { 258:25 - 258:211 }
-function "gx6a" { 258:60 - 258:200 }
-function "gx6b" { 258:96 - 258:189 }
</del><ins>+function "gx6" { 258:19 - 258:211 }
+function "gx6a" { 258:57 - 258:200 }
+function "gx6b" { 258:93 - 258:189 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Indented Functions Declarations:
</span><del>-function "gxi1" { 263:30 - 263:123 }
</del><ins>+function "gxi1" { 263:24 - 263:123 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gxi2" { 266:30 - 270:5 }
-function "gxi2a" { 268:32 - 268:126 }
</del><ins>+function "gxi2" { 266:24 - 270:5 }
+function "gxi2a" { 268:29 - 268:126 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gxi3" { 273:30 - 285:5 }
-function "gxi3a" { 275:32 - 283:9 }
-function "gxi3b" { 277:36 - 281:13 }
</del><ins>+function "gxi3" { 273:24 - 285:5 }
+function "gxi3a" { 275:29 - 283:9 }
+function "gxi3b" { 277:33 - 281:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gxi4" { 288:30 - 288:93 }
-function "gxi4a" { 288:67 - 288:68 }
-function "gxi5" { 290:30 - 290:173 }
-function "gxi5a" { 290:67 - 290:161 }
</del><ins>+function "gxi4" { 288:24 - 288:93 }
+function "gxi4a" { 288:64 - 288:68 }
+function "gxi5" { 290:24 - 290:173 }
+function "gxi5a" { 290:64 - 290:161 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "gxi6" { 292:30 - 292:223 }
-function "gxi6a" { 292:67 - 292:211 }
-function "gxi6b" { 292:105 - 292:199 }
</del><ins>+function "gxi6" { 292:24 - 292:223 }
+function "gxi6a" { 292:64 - 292:211 }
+function "gxi6b" { 292:102 - 292:199 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Anonymous Global Function Declarations:
</span><del>-function "" { 299:56 - 304:1 }
</del><ins>+function "" { 299:50 - 304:1 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Function Declarations in an eval:
</span><span class="cx"> eval { 1:1 - 16:7 }
</span><del>-function "ef1" { 3:20 - 14:5 }
-function "ef1a" { 5:25 - 12:9 }
-function "ef1b" { 7:29 - 10:13 }
</del><ins>+function "ef1" { 3:17 - 14:5 }
+function "ef1a" { 5:22 - 12:9 }
+function "ef1b" { 7:26 - 10:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx"> eval { 1:1 - 1:225 }
</span><del>-function "ef2" { 1:59 - 1:217 }
-function "ef2a" { 1:88 - 1:207 }
-function "ef2b" { 1:118 - 1:197 }
</del><ins>+function "ef2" { 1:56 - 1:217 }
+function "ef2a" { 1:85 - 1:207 }
+function "ef2b" { 1:115 - 1:197 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx"> eval { 1:1 - 17:8 }
</span><del>-function "efi1" { 4:21 - 15:5 }
-function "efi1a" { 6:26 - 13:9 }
-function "efi1b" { 8:30 - 11:13 }
</del><ins>+function "efi1" { 4:18 - 15:5 }
+function "efi1a" { 6:23 - 13:9 }
+function "efi1b" { 8:27 - 11:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx"> eval { 1:1 - 1:234 }
</span><del>-function "efi2" { 1:60 - 1:225 }
-function "efi2a" { 1:91 - 1:214 }
-function "efi2b" { 1:123 - 1:203 }
</del><ins>+function "efi2" { 1:57 - 1:225 }
+function "efi2a" { 1:88 - 1:214 }
+function "efi2b" { 1:120 - 1:203 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> Function Expressions in an eval:
</span><span class="cx"> eval { 1:1 - 16:7 }
</span><del>-function "ex1" { 3:26 - 14:5 }
-function "ex1a" { 5:31 - 12:9 }
-function "ex1b" { 7:35 - 10:13 }
</del><ins>+function "ex1" { 3:23 - 14:5 }
+function "ex1a" { 5:28 - 12:9 }
+function "ex1b" { 7:32 - 10:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx"> eval { 1:1 - 1:246 }
</span><del>-function "ex2" { 1:65 - 1:237 }
-function "ex2a" { 1:100 - 1:226 }
-function "ex2b" { 1:136 - 1:215 }
</del><ins>+function "ex2" { 1:62 - 1:237 }
+function "ex2a" { 1:97 - 1:226 }
+function "ex2b" { 1:133 - 1:215 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx"> eval { 1:1 - 17:8 }
</span><del>-function "exi1" { 4:27 - 15:5 }
-function "exi1a" { 6:32 - 13:9 }
-function "exi1b" { 8:36 - 11:13 }
</del><ins>+function "exi1" { 4:24 - 15:5 }
+function "exi1a" { 6:29 - 13:9 }
+function "exi1b" { 8:33 - 11:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx"> eval { 1:1 - 1:255 }
</span><del>-function "exi2" { 1:66 - 1:245 }
-function "exi2a" { 1:103 - 1:233 }
-function "exi2b" { 1:141 - 1:221 }
</del><ins>+function "exi2" { 1:63 - 1:245 }
+function "exi2a" { 1:100 - 1:233 }
+function "exi2b" { 1:138 - 1:221 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> new Function Object:
</span><del>-function "anonymous" { 1:27 - 2:228 }
-function "nf1a" { 2:60 - 2:219 }
-function "nf1b" { 2:90 - 2:209 }
-function "nf1c" { 2:120 - 2:199 }
</del><ins>+function "anonymous" { 1:20 - 2:228 }
+function "nf1a" { 2:57 - 2:219 }
+function "nf1b" { 2:87 - 2:209 }
+function "nf1c" { 2:117 - 2:199 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "anonymous" { 1:27 - 18:8 }
-function "nf2a" { 5:21 - 16:5 }
-function "nf2b" { 7:25 - 14:9 }
-function "nf2c" { 9:29 - 12:13 }
</del><ins>+function "anonymous" { 1:20 - 18:8 }
+function "nf2a" { 5:18 - 16:5 }
+function "nf2b" { 7:22 - 14:9 }
+function "nf2c" { 9:26 - 12:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "anonymous" { 1:27 - 2:228 }
-function "nf1a" { 2:60 - 2:219 }
-function "nf1b" { 2:90 - 2:209 }
-function "nf1c" { 2:120 - 2:199 }
</del><ins>+function "anonymous" { 1:20 - 2:228 }
+function "nf1a" { 2:57 - 2:219 }
+function "nf1b" { 2:87 - 2:209 }
+function "nf1c" { 2:117 - 2:199 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "anonymous" { 1:27 - 2:237 }
-function "nfi1a" { 2:61 - 2:227 }
-function "nfi1b" { 2:93 - 2:216 }
-function "nfi1c" { 2:125 - 2:205 }
</del><ins>+function "anonymous" { 1:20 - 2:237 }
+function "nfi1a" { 2:58 - 2:227 }
+function "nfi1b" { 2:90 - 2:216 }
+function "nfi1c" { 2:122 - 2:205 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "anonymous" { 1:27 - 18:8 }
-function "nf2a" { 5:21 - 16:5 }
-function "nf2b" { 7:25 - 14:9 }
-function "nf2c" { 9:29 - 12:13 }
</del><ins>+function "anonymous" { 1:20 - 18:8 }
+function "nf2a" { 5:18 - 16:5 }
+function "nf2b" { 7:22 - 14:9 }
+function "nf2c" { 9:26 - 12:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><del>-function "anonymous" { 1:27 - 18:9 }
-function "nfi2a" { 5:22 - 16:5 }
-function "nfi2b" { 7:26 - 14:9 }
-function "nfi2c" { 9:30 - 12:13 }
</del><ins>+function "anonymous" { 1:20 - 18:9 }
+function "nfi2a" { 5:19 - 16:5 }
+function "nfi2b" { 7:23 - 14:9 }
+function "nfi2c" { 9:27 - 12:13 }
</ins><span class="cx"> eval { 1:1 - 1:56 }
</span><span class="cx">
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSScriptRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSScriptRef.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> static bool parseScript(VM* vm, const SourceCode& source, ParserError& error)
</span><span class="cx"> {
</span><span class="cx"> return !!JSC::parse<JSC::ProgramNode>(
</span><del>- vm, source, 0, Identifier(), JSParserBuiltinMode::NotBuiltin,
</del><ins>+ vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin,
</ins><span class="cx"> JSParserStrictMode::NotStrict, JSParserCodeType::Program,
</span><span class="cx"> error);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -1,3 +1,212 @@
</span><ins>+2015-07-17 Saam barati <saambarati1@gmail.com>
+
+ Function parameters should be parsed in the same parser arena as the function body
+ https://bugs.webkit.org/show_bug.cgi?id=145995
+
+ Reviewed by Yusuke Suzuki.
+
+ This patch changes how functions are parsed in JSC. A function's
+ parameters are now parsed in the same arena as the function itself.
+ This allows us to arena allocate all destructuring AST nodes and
+ the FunctionParameters node. This will help make implementing ES6
+ default parameter values sane.
+
+ A source code that represents a function now includes the text of the function's
+ parameters. The starting offset is at the opening parenthesis of the parameter
+ list or at the starting character of the identifier for arrow functions that
+ have single arguments and don't start with parenthesis.
+
+ For example:
+
+ "function (param1, param2) { ... }"
+ ^
+ | This offset used to be the starting offset of a function's SourceCode
+ ^
+ | This is the new starting offset for a function's SourceCode.
+
+ This requires us to change how some offsets are calculated
+ and also requires us to report some different line numbers for internal
+ metrics that use a SourceCode's starting line and column numbers.
+
+ This patch also does a bit of cleanup with regards to how
+ functions are parsed in general (especially arrow functions).
+ It removes some unnecessary #ifdefs and the likes for arrow
+ to make things clearer and more deliberate.
+
+ * API/JSScriptRef.cpp:
+ (parseScript):
+ * builtins/BuiltinExecutables.cpp:
+ (JSC::BuiltinExecutables::createExecutableInternal):
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::generateFunctionCodeBlock):
+ (JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
+ (JSC::UnlinkedFunctionExecutable::visitChildren):
+ (JSC::UnlinkedFunctionExecutable::parameterCount): Deleted.
+ * bytecode/UnlinkedCodeBlock.h:
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::DestructuringAssignmentNode::emitBytecode):
+ (JSC::assignDefaultValueIfUndefined):
+ (JSC::ArrayPatternNode::collectBoundIdentifiers):
+ (JSC::DestructuringPatternNode::~DestructuringPatternNode): Deleted.
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::createClassExpr):
+ (JSC::ASTBuilder::createFunctionExpr):
+ (JSC::ASTBuilder::createFunctionBody):
+ (JSC::ASTBuilder::createArrowFunctionExpr):
+ (JSC::ASTBuilder::createGetterOrSetterProperty):
+ (JSC::ASTBuilder::createElementList):
+ (JSC::ASTBuilder::createFormalParameterList):
+ (JSC::ASTBuilder::appendParameter):
+ (JSC::ASTBuilder::createClause):
+ (JSC::ASTBuilder::createClauseList):
+ (JSC::ASTBuilder::createFuncDeclStatement):
+ (JSC::ASTBuilder::createForInLoop):
+ (JSC::ASTBuilder::createForOfLoop):
+ (JSC::ASTBuilder::isResolve):
+ (JSC::ASTBuilder::createDestructuringAssignment):
+ (JSC::ASTBuilder::createArrayPattern):
+ (JSC::ASTBuilder::appendArrayPatternSkipEntry):
+ (JSC::ASTBuilder::appendArrayPatternEntry):
+ (JSC::ASTBuilder::appendArrayPatternRestEntry):
+ (JSC::ASTBuilder::finishArrayPattern):
+ (JSC::ASTBuilder::createObjectPattern):
+ (JSC::ASTBuilder::appendObjectPatternEntry):
+ (JSC::ASTBuilder::createBindingLocation):
+ (JSC::ASTBuilder::setEndOffset):
+ * parser/Lexer.cpp:
+ (JSC::Lexer<T>::Lexer):
+ (JSC::Lexer<T>::nextTokenIsColon):
+ (JSC::Lexer<T>::setTokenPosition):
+ (JSC::Lexer<T>::lex):
+ (JSC::Lexer<T>::clear):
+ * parser/Lexer.h:
+ (JSC::Lexer::setIsReparsingFunction):
+ (JSC::Lexer::isReparsingFunction):
+ (JSC::Lexer::lineNumber):
+ (JSC::Lexer::setIsReparsing): Deleted.
+ (JSC::Lexer::isReparsing): Deleted.
+ * parser/NodeConstructors.h:
+ (JSC::TryNode::TryNode):
+ (JSC::FunctionParameters::FunctionParameters):
+ (JSC::FuncExprNode::FuncExprNode):
+ (JSC::FuncDeclNode::FuncDeclNode):
+ (JSC::ArrayPatternNode::ArrayPatternNode):
+ (JSC::ObjectPatternNode::ObjectPatternNode):
+ (JSC::BindingNode::BindingNode):
+ (JSC::DestructuringAssignmentNode::DestructuringAssignmentNode):
+ (JSC::ParameterNode::ParameterNode): Deleted.
+ (JSC::ArrayPatternNode::create): Deleted.
+ (JSC::ObjectPatternNode::create): Deleted.
+ (JSC::BindingNode::create): Deleted.
+ * parser/Nodes.cpp:
+ (JSC::ProgramNode::ProgramNode):
+ (JSC::EvalNode::EvalNode):
+ (JSC::FunctionBodyNode::FunctionBodyNode):
+ (JSC::FunctionBodyNode::finishParsing):
+ (JSC::FunctionNode::FunctionNode):
+ (JSC::FunctionNode::finishParsing):
+ (JSC::FunctionParameters::create): Deleted.
+ (JSC::FunctionParameters::FunctionParameters): Deleted.
+ (JSC::FunctionParameters::~FunctionParameters): Deleted.
+ * parser/Nodes.h:
+ (JSC::ProgramNode::startColumn):
+ (JSC::ProgramNode::endColumn):
+ (JSC::EvalNode::startColumn):
+ (JSC::EvalNode::endColumn):
+ (JSC::FunctionParameters::size):
+ (JSC::FunctionParameters::at):
+ (JSC::FunctionParameters::append):
+ (JSC::FuncExprNode::body):
+ (JSC::DestructuringPatternNode::~DestructuringPatternNode):
+ (JSC::DestructuringPatternNode::isBindingNode):
+ (JSC::DestructuringPatternNode::emitDirectBinding):
+ (JSC::ArrayPatternNode::appendIndex):
+ (JSC::ObjectPatternNode::appendEntry):
+ (JSC::BindingNode::boundProperty):
+ (JSC::BindingNode::divotStart):
+ (JSC::BindingNode::divotEnd):
+ (JSC::DestructuringAssignmentNode::bindings):
+ (JSC::FuncDeclNode::body):
+ (JSC::ParameterNode::pattern): Deleted.
+ (JSC::ParameterNode::nextParam): Deleted.
+ (JSC::FunctionParameters::patterns): Deleted.
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::Parser):
+ (JSC::Parser<LexerType>::~Parser):
+ (JSC::Parser<LexerType>::parseInner):
+ (JSC::Parser<LexerType>::allowAutomaticSemicolon):
+ (JSC::Parser<LexerType>::parseSourceElements):
+ (JSC::Parser<LexerType>::createBindingPattern):
+ (JSC::Parser<LexerType>::parseArrowFunctionSingleExpressionBodySourceElements):
+ (JSC::Parser<LexerType>::tryParseDestructuringPatternExpression):
+ (JSC::Parser<LexerType>::parseSwitchClauses):
+ (JSC::Parser<LexerType>::parseSwitchDefaultClause):
+ (JSC::Parser<LexerType>::parseBlockStatement):
+ (JSC::Parser<LexerType>::parseStatement):
+ (JSC::Parser<LexerType>::parseFormalParameters):
+ (JSC::Parser<LexerType>::parseFunctionBody):
+ (JSC::stringForFunctionMode):
+ (JSC::Parser<LexerType>::parseFunctionParameters):
+ (JSC::Parser<LexerType>::parseFunctionInfo):
+ (JSC::Parser<LexerType>::parseFunctionDeclaration):
+ (JSC::Parser<LexerType>::parseClass):
+ (JSC::Parser<LexerType>::parsePrimaryExpression):
+ (JSC::Parser<LexerType>::parseMemberExpression):
+ (JSC::Parser<LexerType>::parseArrowFunctionExpression):
+ (JSC::operatorString):
+ (JSC::Parser<LexerType>::parseArrowFunctionSingleExpressionBody): Deleted.
+ * parser/Parser.h:
+ (JSC::Parser::positionBeforeLastNewline):
+ (JSC::Parser::locationBeforeLastToken):
+ (JSC::Parser::findCachedFunctionInfo):
+ (JSC::Parser::isofToken):
+ (JSC::Parser::isEndOfArrowFunction):
+ (JSC::Parser::isArrowFunctionParamters):
+ (JSC::Parser::tokenStart):
+ (JSC::Parser::isLETMaskedAsIDENT):
+ (JSC::Parser::autoSemiColon):
+ (JSC::Parser::setEndOfStatement):
+ (JSC::Parser::canRecurse):
+ (JSC::Parser<LexerType>::parse):
+ (JSC::parse):
+ * parser/ParserFunctionInfo.h:
+ * parser/ParserModes.h:
+ (JSC::functionNameIsInScope):
+ * parser/SourceCode.h:
+ (JSC::makeSource):
+ (JSC::SourceCode::subExpression):
+ (JSC::SourceCode::subArrowExpression): Deleted.
+ * parser/SourceProviderCache.h:
+ (JSC::SourceProviderCache::get):
+ * parser/SourceProviderCacheItem.h:
+ (JSC::SourceProviderCacheItem::endFunctionToken):
+ (JSC::SourceProviderCacheItem::usedVariables):
+ (JSC::SourceProviderCacheItem::writtenVariables):
+ (JSC::SourceProviderCacheItem::SourceProviderCacheItem):
+ * parser/SyntaxChecker.h:
+ (JSC::SyntaxChecker::SyntaxChecker):
+ (JSC::SyntaxChecker::createClassExpr):
+ (JSC::SyntaxChecker::createFunctionExpr):
+ (JSC::SyntaxChecker::createFunctionBody):
+ (JSC::SyntaxChecker::createArrowFunctionExpr):
+ (JSC::SyntaxChecker::setFunctionNameStart):
+ (JSC::SyntaxChecker::createArguments):
+ (JSC::SyntaxChecker::createPropertyList):
+ (JSC::SyntaxChecker::createElementList):
+ (JSC::SyntaxChecker::createFormalParameterList):
+ (JSC::SyntaxChecker::appendParameter):
+ (JSC::SyntaxChecker::createClause):
+ (JSC::SyntaxChecker::createClauseList):
+ * runtime/CodeCache.cpp:
+ (JSC::CodeCache::getGlobalCodeBlock):
+ (JSC::CodeCache::getFunctionExecutableFromGlobalCode):
+ * runtime/Completion.cpp:
+ (JSC::checkSyntax):
+ * runtime/Executable.cpp:
+ (JSC::ProgramExecutable::checkSyntax):
+ * tests/controlFlowProfiler/conditional-expression.js:
+ (testConditionalFunctionCall):
+
</ins><span class="cx"> 2015-07-16 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix build for newer LLVMs.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsBuiltinExecutablescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -69,10 +69,9 @@
</span><span class="cx"> UnlinkedFunctionKind kind = isParsingDefaultConstructor ? UnlinkedNormalFunction : UnlinkedBuiltinFunction;
</span><span class="cx"> RefPtr<SourceProvider> sourceOverride = isParsingDefaultConstructor ? source.provider() : nullptr;
</span><span class="cx"> std::unique_ptr<ProgramNode> program = parse<ProgramNode>(
</span><del>- &m_vm, source, 0, Identifier(), builtinMode,
- JSParserStrictMode::NotStrict,
- JSParserCodeType::Program,
- error, &positionBeforeLastNewline, constructorKind);
</del><ins>+ &m_vm, source, Identifier(), builtinMode,
+ JSParserStrictMode::NotStrict, JSParserCodeType::Program, error,
+ &positionBeforeLastNewline, FunctionParseMode::NotAFunctionMode, constructorKind);
</ins><span class="cx">
</span><span class="cx"> if (!program) {
</span><span class="cx"> dataLog("Fatal error compiling builtin function '", name.string(), "': ", error.message());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -60,15 +60,15 @@
</span><span class="cx"> JSParserBuiltinMode builtinMode = executable->isBuiltinFunction() ? JSParserBuiltinMode::Builtin : JSParserBuiltinMode::NotBuiltin;
</span><span class="cx"> JSParserStrictMode strictMode = executable->isInStrictContext() ? JSParserStrictMode::Strict : JSParserStrictMode::NotStrict;
</span><span class="cx"> std::unique_ptr<FunctionNode> function = parse<FunctionNode>(
</span><del>- &vm, source, executable->parameters(), executable->name(), builtinMode,
- strictMode, JSParserCodeType::Function, error, 0);
</del><ins>+ &vm, source, executable->name(), builtinMode, strictMode,
+ JSParserCodeType::Function, error, nullptr, executable->parseMode());
</ins><span class="cx">
</span><span class="cx"> if (!function) {
</span><span class="cx"> ASSERT(error.isValid());
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function->finishParsing(executable->parameters(), executable->name(), executable->functionMode());
</del><ins>+ function->finishParsing(executable->name(), executable->functionMode());
</ins><span class="cx"> executable->recordParse(function->features(), function->hasCapturedVariables());
</span><span class="cx">
</span><span class="cx"> UnlinkedFunctionCodeBlock* result = UnlinkedFunctionCodeBlock::create(&vm, FunctionCode,
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx"> : Base(*vm, structure)
</span><span class="cx"> , m_name(node->ident())
</span><span class="cx"> , m_inferredName(node->inferredName())
</span><del>- , m_parameters(node->parameters())
</del><span class="cx"> , m_sourceOverride(WTF::move(sourceOverride))
</span><span class="cx"> , m_firstLineOffset(node->firstLine() - source.firstLine())
</span><span class="cx"> , m_lineCount(node->lastLine() - node->firstLine())
</span><span class="lines">@@ -96,6 +95,8 @@
</span><span class="cx"> , m_parametersStartOffset(node->parametersStart())
</span><span class="cx"> , m_typeProfilingStartOffset(node->functionKeywordStart())
</span><span class="cx"> , m_typeProfilingEndOffset(node->startStartOffset() + node->source().length() - 1)
</span><ins>+ , m_parameterCount(node->parameterCount())
+ , m_parseMode(node->parseMode())
</ins><span class="cx"> , m_features(0)
</span><span class="cx"> , m_isInStrictContext(node->isInStrictContext())
</span><span class="cx"> , m_hasCapturedVariables(false)
</span><span class="lines">@@ -107,11 +108,6 @@
</span><span class="cx"> m_parentScopeTDZVariables.swap(parentScopeTDZVariables);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-size_t UnlinkedFunctionExecutable::parameterCount() const
-{
- return m_parameters->size();
-}
-
</del><span class="cx"> void UnlinkedFunctionExecutable::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> UnlinkedFunctionExecutable* thisObject = jsCast<UnlinkedFunctionExecutable*>(cell);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> class Debugger;
</span><span class="cx"> class FunctionBodyNode;
</span><span class="cx"> class FunctionExecutable;
</span><del>-class FunctionParameters;
</del><span class="cx"> class JSScope;
</span><span class="cx"> class ParserError;
</span><span class="cx"> class ScriptExecutable;
</span><span class="lines">@@ -123,7 +122,8 @@
</span><span class="cx"> {
</span><span class="cx"> return (kind == CodeForCall) ? m_symbolTableForCall.get() : m_symbolTableForConstruct.get();
</span><span class="cx"> }
</span><del>- size_t parameterCount() const;
</del><ins>+ unsigned parameterCount() const { return m_parameterCount; };
+ FunctionParseMode parseMode() const { return m_parseMode; };
</ins><span class="cx"> bool isInStrictContext() const { return m_isInStrictContext; }
</span><span class="cx"> FunctionMode functionMode() const { return static_cast<FunctionMode>(m_functionMode); }
</span><span class="cx"> ConstructorKind constructorKind() const { return static_cast<ConstructorKind>(m_constructorKind); }
</span><span class="lines">@@ -155,8 +155,6 @@
</span><span class="cx"> m_codeBlockForConstruct.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FunctionParameters* parameters() { return m_parameters.get(); }
-
</del><span class="cx"> void recordParse(CodeFeatures features, bool hasCapturedVariables)
</span><span class="cx"> {
</span><span class="cx"> m_features = features;
</span><span class="lines">@@ -183,7 +181,6 @@
</span><span class="cx"> WriteBarrier<JSString> m_nameValue;
</span><span class="cx"> WriteBarrier<SymbolTable> m_symbolTableForCall;
</span><span class="cx"> WriteBarrier<SymbolTable> m_symbolTableForConstruct;
</span><del>- RefPtr<FunctionParameters> m_parameters;
</del><span class="cx"> RefPtr<SourceProvider> m_sourceOverride;
</span><span class="cx"> VariableEnvironment m_parentScopeTDZVariables;
</span><span class="cx"> unsigned m_firstLineOffset;
</span><span class="lines">@@ -196,6 +193,8 @@
</span><span class="cx"> unsigned m_parametersStartOffset;
</span><span class="cx"> unsigned m_typeProfilingStartOffset;
</span><span class="cx"> unsigned m_typeProfilingEndOffset;
</span><ins>+ unsigned m_parameterCount;
+ FunctionParseMode m_parseMode;
</ins><span class="cx">
</span><span class="cx"> CodeFeatures m_features;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -3189,10 +3189,6 @@
</span><span class="cx"> return generator.moveToDestinationIfNeeded(dst, initializer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DestructuringPatternNode::~DestructuringPatternNode()
-{
-}
-
</del><span class="cx"> static void assignDefaultValueIfUndefined(BytecodeGenerator& generator, RegisterID* maybeUndefined, ExpressionNode* defaultValue)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(defaultValue);
</span><span class="lines">@@ -3350,7 +3346,7 @@
</span><span class="cx"> void ArrayPatternNode::collectBoundIdentifiers(Vector<Identifier>& identifiers) const
</span><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < m_targetPatterns.size(); i++) {
</span><del>- if (DestructuringPatternNode* node = m_targetPatterns[i].pattern.get())
</del><ins>+ if (DestructuringPatternNode* node = m_targetPatterns[i].pattern)
</ins><span class="cx"> node->collectBoundIdentifiers(identifiers);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -94,8 +94,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><del>- typedef SyntaxChecker FunctionBodyBuilder;
-
</del><span class="cx"> typedef ExpressionNode* Expression;
</span><span class="cx"> typedef JSC::SourceElements* SourceElements;
</span><span class="cx"> typedef ArgumentsNode* Arguments;
</span><span class="lines">@@ -110,7 +108,7 @@
</span><span class="cx"> typedef TemplateStringListNode* TemplateStringList;
</span><span class="cx"> typedef TemplateLiteralNode* TemplateLiteral;
</span><span class="cx"> #endif
</span><del>- typedef ParameterNode* FormalParameterList;
</del><ins>+ typedef FunctionParameters* FormalParameterList;
</ins><span class="cx"> typedef FunctionBodyNode* FunctionBody;
</span><span class="cx"> #if ENABLE(ES6_CLASS_SYNTAX)
</span><span class="cx"> typedef ClassExprNode* ClassExpression;
</span><span class="lines">@@ -120,10 +118,10 @@
</span><span class="cx"> typedef CaseClauseNode* Clause;
</span><span class="cx"> typedef ConstDeclNode* ConstDeclList;
</span><span class="cx"> typedef std::pair<ExpressionNode*, BinaryOpInfo> BinaryOperand;
</span><del>- typedef RefPtr<DestructuringPatternNode> DestructuringPattern;
- typedef RefPtr<ArrayPatternNode> ArrayPattern;
- typedef RefPtr<ObjectPatternNode> ObjectPattern;
- typedef RefPtr<BindingNode> BindingPattern;
</del><ins>+ typedef DestructuringPatternNode* DestructuringPattern;
+ typedef ArrayPatternNode* ArrayPattern;
+ typedef ObjectPatternNode* ObjectPattern;
+ typedef BindingNode* BindingPattern;
</ins><span class="cx"> static const bool CreatesAST = true;
</span><span class="cx"> static const bool NeedsFreeVariableInfo = true;
</span><span class="cx"> static const bool CanUseFunctionCache = true;
</span><span class="lines">@@ -344,11 +342,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- ExpressionNode* createFunctionExpr(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& info)
</del><ins>+ ExpressionNode* createFunctionExpr(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& functionInfo)
</ins><span class="cx"> {
</span><del>- FuncExprNode* result = new (m_parserArena) FuncExprNode(location, *info.name, info.body,
- m_sourceCode->subExpression(info.startFunctionOffset, info.endFunctionOffset, info.bodyStartLine, info.bodyStartColumn), info.parameters);
- info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
</del><ins>+ FuncExprNode* result = new (m_parserArena) FuncExprNode(location, *functionInfo.name, functionInfo.body,
+ m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.bodyStartColumn));
+ functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -356,45 +354,41 @@
</span><span class="cx"> const JSTokenLocation& startLocation, const JSTokenLocation& endLocation,
</span><span class="cx"> unsigned startColumn, unsigned endColumn, int functionKeywordStart,
</span><span class="cx"> int functionNameStart, int parametersStart, bool inStrictContext,
</span><del>- ConstructorKind constructorKind)
</del><ins>+ ConstructorKind constructorKind, unsigned parameterCount, FunctionParseMode mode)
</ins><span class="cx"> {
</span><span class="cx"> return new (m_parserArena) FunctionBodyNode(
</span><span class="cx"> m_parserArena, startLocation, endLocation, startColumn, endColumn,
</span><span class="cx"> functionKeywordStart, functionNameStart, parametersStart,
</span><del>- inStrictContext, constructorKind);
</del><ins>+ inStrictContext, constructorKind, parameterCount, mode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- ExpressionNode* createArrowFunctionExpr(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& info)
</del><ins>+ ExpressionNode* createArrowFunctionExpr(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& functionInfo)
</ins><span class="cx"> {
</span><del>- SourceCode source = info.functionBodyType == ArrowFunctionBodyExpression
- ? m_sourceCode->subArrowExpression(info.arrowFunctionOffset, info.endFunctionOffset, info.bodyStartLine, info.bodyStartColumn)
- : m_sourceCode->subExpression(info.startFunctionOffset, info.endFunctionOffset, info.bodyStartLine, info.bodyStartColumn);
</del><ins>+ SourceCode source = m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.bodyStartColumn);
</ins><span class="cx">
</span><del>- FuncExprNode* result = new (m_parserArena) FuncExprNode(location, *info.name, info.body, source, info.parameters);
- info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
</del><ins>+ FuncExprNode* result = new (m_parserArena) FuncExprNode(location, *functionInfo.name, functionInfo.body, source);
+ functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> NEVER_INLINE PropertyNode* createGetterOrSetterProperty(const JSTokenLocation& location, PropertyNode::Type type, bool,
</span><del>- const Identifier* name, const ParserFunctionInfo<ASTBuilder>& info, SuperBinding superBinding)
</del><ins>+ const Identifier* name, const ParserFunctionInfo<ASTBuilder>& functionInfo, SuperBinding superBinding)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(name);
</span><del>- info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
- info.body->setInferredName(*name);
- SourceCode source = m_sourceCode->subExpression(info.startFunctionOffset, info.endFunctionOffset, info.bodyStartLine, info.bodyStartColumn);
- FuncExprNode* funcExpr = new (m_parserArena) FuncExprNode(location, m_vm->propertyNames->nullIdentifier, info.body, source, info.parameters);
</del><ins>+ functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
+ functionInfo.body->setInferredName(*name);
+ SourceCode source = m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.bodyStartColumn);
+ FuncExprNode* funcExpr = new (m_parserArena) FuncExprNode(location, m_vm->propertyNames->nullIdentifier, functionInfo.body, source);
</ins><span class="cx"> return new (m_parserArena) PropertyNode(*name, funcExpr, type, PropertyNode::Unknown, superBinding);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NEVER_INLINE PropertyNode* createGetterOrSetterProperty(VM* vm, ParserArena& parserArena, const JSTokenLocation& location, PropertyNode::Type type, bool,
</span><del>- double name, const ParserFunctionInfo<ASTBuilder>& info, SuperBinding superBinding)
</del><ins>+ double name, const ParserFunctionInfo<ASTBuilder>& functionInfo, SuperBinding superBinding)
</ins><span class="cx"> {
</span><del>- info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
</del><ins>+ functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
</ins><span class="cx"> const Identifier& ident = parserArena.identifierArena().makeNumericIdentifier(vm, name);
</span><del>- SourceCode source = m_sourceCode->subExpression(info.startFunctionOffset, info.endFunctionOffset, info.bodyStartLine, info.bodyStartColumn);
- FuncExprNode* funcExpr = new (m_parserArena) FuncExprNode(location, vm->propertyNames->nullIdentifier, info.body, source, info.parameters);
</del><ins>+ SourceCode source = m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.bodyStartColumn);
+ FuncExprNode* funcExpr = new (m_parserArena) FuncExprNode(location, vm->propertyNames->nullIdentifier, functionInfo.body, source);
</ins><span class="cx"> return new (m_parserArena) PropertyNode(ident, funcExpr, type, PropertyNode::Unknown, superBinding);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -420,21 +414,21 @@
</span><span class="cx"> ElementNode* createElementList(int elisions, ExpressionNode* expr) { return new (m_parserArena) ElementNode(elisions, expr); }
</span><span class="cx"> ElementNode* createElementList(ElementNode* elems, int elisions, ExpressionNode* expr) { return new (m_parserArena) ElementNode(elems, elisions, expr); }
</span><span class="cx">
</span><del>- ParameterNode* createFormalParameterList(DestructuringPattern pattern) { return new (m_parserArena) ParameterNode(pattern); }
- ParameterNode* createFormalParameterList(ParameterNode* list, DestructuringPattern pattern) { return new (m_parserArena) ParameterNode(list, pattern); }
</del><ins>+ FormalParameterList createFormalParameterList() { return new (m_parserArena) FunctionParameters(); }
+ void appendParameter(FormalParameterList list, DestructuringPattern pattern) { list->append(pattern); }
</ins><span class="cx">
</span><span class="cx"> CaseClauseNode* createClause(ExpressionNode* expr, JSC::SourceElements* statements) { return new (m_parserArena) CaseClauseNode(expr, statements); }
</span><span class="cx"> ClauseListNode* createClauseList(CaseClauseNode* clause) { return new (m_parserArena) ClauseListNode(clause); }
</span><span class="cx"> ClauseListNode* createClauseList(ClauseListNode* tail, CaseClauseNode* clause) { return new (m_parserArena) ClauseListNode(tail, clause); }
</span><span class="cx">
</span><del>- StatementNode* createFuncDeclStatement(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& info)
</del><ins>+ StatementNode* createFuncDeclStatement(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& functionInfo)
</ins><span class="cx"> {
</span><del>- FuncDeclNode* decl = new (m_parserArena) FuncDeclNode(location, *info.name, info.body,
- m_sourceCode->subExpression(info.startFunctionOffset, info.endFunctionOffset, info.bodyStartLine, info.bodyStartColumn), info.parameters);
- if (*info.name == m_vm->propertyNames->arguments)
</del><ins>+ FuncDeclNode* decl = new (m_parserArena) FuncDeclNode(location, *functionInfo.name, functionInfo.body,
+ m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.endOffset, functionInfo.startLine, functionInfo.bodyStartColumn));
+ if (*functionInfo.name == m_vm->propertyNames->arguments)
</ins><span class="cx"> usesArguments();
</span><span class="cx"> m_scope.m_funcDeclarations.append(decl->body());
</span><del>- info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
</del><ins>+ functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
</ins><span class="cx"> return decl;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -486,9 +480,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- StatementNode* createForInLoop(const JSTokenLocation& location, PassRefPtr<DestructuringPatternNode> pattern, ExpressionNode* iter, StatementNode* statements, const JSTextPosition& eStart, const JSTextPosition& eDivot, const JSTextPosition& eEnd, int start, int end, VariableEnvironment& lexicalVariables)
</del><ins>+ StatementNode* createForInLoop(const JSTokenLocation& location, DestructuringPatternNode* pattern, ExpressionNode* iter, StatementNode* statements, const JSTextPosition& eStart, const JSTextPosition& eDivot, const JSTextPosition& eEnd, int start, int end, VariableEnvironment& lexicalVariables)
</ins><span class="cx"> {
</span><del>- auto lexpr = new (m_parserArena) DestructuringAssignmentNode(location, pattern.get(), 0);
</del><ins>+ auto lexpr = new (m_parserArena) DestructuringAssignmentNode(location, pattern, 0);
</ins><span class="cx"> return createForInLoop(location, lexpr, iter, statements, eStart, eDivot, eEnd, start, end, lexicalVariables);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -500,9 +494,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- StatementNode* createForOfLoop(const JSTokenLocation& location, PassRefPtr<DestructuringPatternNode> pattern, ExpressionNode* iter, StatementNode* statements, const JSTextPosition& eStart, const JSTextPosition& eDivot, const JSTextPosition& eEnd, int start, int end, VariableEnvironment& lexicalVariables)
</del><ins>+ StatementNode* createForOfLoop(const JSTokenLocation& location, DestructuringPatternNode* pattern, ExpressionNode* iter, StatementNode* statements, const JSTextPosition& eStart, const JSTextPosition& eDivot, const JSTextPosition& eEnd, int start, int end, VariableEnvironment& lexicalVariables)
</ins><span class="cx"> {
</span><del>- auto lexpr = new (m_parserArena) DestructuringAssignmentNode(location, pattern.get(), 0);
</del><ins>+ auto lexpr = new (m_parserArena) DestructuringAssignmentNode(location, pattern, 0);
</ins><span class="cx"> return createForOfLoop(location, lexpr, iter, statements, eStart, eDivot, eEnd, start, end, lexicalVariables);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -745,14 +739,14 @@
</span><span class="cx">
</span><span class="cx"> bool isResolve(ExpressionNode* expr) const { return expr->isResolveNode(); }
</span><span class="cx">
</span><del>- ExpressionNode* createDestructuringAssignment(const JSTokenLocation& location, PassRefPtr<DestructuringPatternNode> pattern, ExpressionNode* initializer)
</del><ins>+ ExpressionNode* createDestructuringAssignment(const JSTokenLocation& location, DestructuringPattern pattern, ExpressionNode* initializer)
</ins><span class="cx"> {
</span><del>- return new (m_parserArena) DestructuringAssignmentNode(location, pattern.get(), initializer);
</del><ins>+ return new (m_parserArena) DestructuringAssignmentNode(location, pattern, initializer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ArrayPattern createArrayPattern(const JSTokenLocation&)
</span><span class="cx"> {
</span><del>- return ArrayPatternNode::create();
</del><ins>+ return new (m_parserArena) ArrayPatternNode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void appendArrayPatternSkipEntry(ArrayPattern node, const JSTokenLocation& location)
</span><span class="lines">@@ -762,32 +756,32 @@
</span><span class="cx">
</span><span class="cx"> void appendArrayPatternEntry(ArrayPattern node, const JSTokenLocation& location, DestructuringPattern pattern, ExpressionNode* defaultValue)
</span><span class="cx"> {
</span><del>- node->appendIndex(ArrayPatternNode::BindingType::Element, location, pattern.get(), defaultValue);
</del><ins>+ node->appendIndex(ArrayPatternNode::BindingType::Element, location, pattern, defaultValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void appendArrayPatternRestEntry(ArrayPattern node, const JSTokenLocation& location, DestructuringPattern pattern)
</span><span class="cx"> {
</span><del>- node->appendIndex(ArrayPatternNode::BindingType::RestElement, location, pattern.get(), nullptr);
</del><ins>+ node->appendIndex(ArrayPatternNode::BindingType::RestElement, location, pattern, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void finishArrayPattern(ArrayPattern node, const JSTextPosition& divotStart, const JSTextPosition& divot, const JSTextPosition& divotEnd)
</span><span class="cx"> {
</span><del>- setExceptionLocation(node.get(), divotStart, divot, divotEnd);
</del><ins>+ setExceptionLocation(node, divotStart, divot, divotEnd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ObjectPattern createObjectPattern(const JSTokenLocation&)
</span><span class="cx"> {
</span><del>- return ObjectPatternNode::create();
</del><ins>+ return new (m_parserArena) ObjectPatternNode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void appendObjectPatternEntry(ObjectPattern node, const JSTokenLocation& location, bool wasString, const Identifier& identifier, DestructuringPattern pattern, ExpressionNode* defaultValue)
</span><span class="cx"> {
</span><del>- node->appendEntry(location, identifier, wasString, pattern.get(), defaultValue);
</del><ins>+ node->appendEntry(location, identifier, wasString, pattern, defaultValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BindingPattern createBindingLocation(const JSTokenLocation&, const Identifier& boundProperty, const JSTextPosition& start, const JSTextPosition& end, AssignmentContext context)
</span><span class="cx"> {
</span><del>- return BindingNode::create(boundProperty, start, end, context);
</del><ins>+ return new (m_parserArena) BindingNode(boundProperty, start, end, context);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setEndOffset(Node* node, int offset)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/Lexer.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -494,7 +494,7 @@
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><span class="cx"> Lexer<T>::Lexer(VM* vm, JSParserBuiltinMode builtinMode)
</span><del>- : m_isReparsing(false)
</del><ins>+ : m_isReparsingFunction(false)
</ins><span class="cx"> , m_vm(vm)
</span><span class="cx"> , m_parsingBuiltinFunction(builtinMode == JSParserBuiltinMode::Builtin)
</span><span class="cx"> {
</span><span class="lines">@@ -1715,7 +1715,6 @@
</span><span class="cx"> return code < m_codeEnd && *code == ':';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> template <typename T>
</span><span class="cx"> void Lexer<T>::setTokenPosition(JSToken* tokenRecord)
</span><span class="cx"> {
</span><span class="lines">@@ -1725,7 +1724,6 @@
</span><span class="cx"> tokenData->lineStartOffset = currentLineStartOffset();
</span><span class="cx"> ASSERT(tokenData->offset >= tokenData->lineStartOffset);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> template <typename T>
</span><span class="cx"> JSTokenType Lexer<T>::lex(JSToken* tokenRecord, unsigned lexerFlags, bool strictMode)
</span><span class="lines">@@ -2411,7 +2409,7 @@
</span><span class="cx"> Vector<UChar> newBufferForRawTemplateString16;
</span><span class="cx"> m_bufferForRawTemplateString16.swap(newBufferForRawTemplateString16);
</span><span class="cx">
</span><del>- m_isReparsing = false;
</del><ins>+ m_isReparsingFunction = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Instantiate the two flavors of Lexer we need instead of putting most of this file in Lexer.h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/Lexer.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -84,12 +84,10 @@
</span><span class="cx">
</span><span class="cx"> // Functions to set up parsing.
</span><span class="cx"> void setCode(const SourceCode&, ParserArena*);
</span><del>- void setIsReparsing() { m_isReparsing = true; }
- bool isReparsing() const { return m_isReparsing; }
</del><ins>+ void setIsReparsingFunction() { m_isReparsingFunction = true; }
+ bool isReparsingFunction() const { return m_isReparsingFunction; }
</ins><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> void setTokenPosition(JSToken* tokenRecord);
</span><del>-#endif
</del><span class="cx"> JSTokenType lex(JSToken*, unsigned, bool strictMode);
</span><span class="cx"> bool nextTokenIsColon();
</span><span class="cx"> int lineNumber() const { return m_lineNumber; }
</span><span class="lines">@@ -224,7 +222,7 @@
</span><span class="cx"> const T* m_lineStart;
</span><span class="cx"> JSTextPosition m_positionBeforeLastNewline;
</span><span class="cx"> JSTokenLocation m_lastTockenLocation;
</span><del>- bool m_isReparsing;
</del><ins>+ bool m_isReparsingFunction;
</ins><span class="cx"> bool m_atLineStart;
</span><span class="cx"> bool m_error;
</span><span class="cx"> String m_lexErrorMessage;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodeConstructorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/NodeConstructors.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/NodeConstructors.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/NodeConstructors.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -828,34 +828,22 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline ParameterNode::ParameterNode(PassRefPtr<DestructuringPatternNode> pattern)
- : m_pattern(pattern)
- , m_next(0)
</del><ins>+ inline FunctionParameters::FunctionParameters()
</ins><span class="cx"> {
</span><del>- ASSERT(m_pattern);
</del><span class="cx"> }
</span><span class="cx">
</span><del>- inline ParameterNode::ParameterNode(ParameterNode* previous, PassRefPtr<DestructuringPatternNode> pattern)
- : m_pattern(pattern)
- , m_next(0)
- {
- previous->m_next = this;
- ASSERT(m_pattern);
- ASSERT(previous->m_pattern);
- }
-
- inline FuncExprNode::FuncExprNode(const JSTokenLocation& location, const Identifier& ident, FunctionBodyNode* body, const SourceCode& source, ParameterNode* parameter)
</del><ins>+ inline FuncExprNode::FuncExprNode(const JSTokenLocation& location, const Identifier& ident, FunctionBodyNode* body, const SourceCode& source)
</ins><span class="cx"> : ExpressionNode(location)
</span><span class="cx"> , m_body(body)
</span><span class="cx"> {
</span><del>- m_body->finishParsing(source, parameter, ident, FunctionExpression);
</del><ins>+ m_body->finishParsing(source, ident, FunctionExpression);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- inline FuncDeclNode::FuncDeclNode(const JSTokenLocation& location, const Identifier& ident, FunctionBodyNode* body, const SourceCode& source, ParameterNode* parameter)
</del><ins>+ inline FuncDeclNode::FuncDeclNode(const JSTokenLocation& location, const Identifier& ident, FunctionBodyNode* body, const SourceCode& source)
</ins><span class="cx"> : StatementNode(location)
</span><span class="cx"> , m_body(body)
</span><span class="cx"> {
</span><del>- m_body->finishParsing(source, parameter, ident, FunctionDeclaration);
</del><ins>+ m_body->finishParsing(source, ident, FunctionDeclaration);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ES6_CLASS_SYNTAX)
</span><span class="lines">@@ -954,26 +942,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline Ref<ArrayPatternNode> ArrayPatternNode::create()
- {
- return adoptRef(*new ArrayPatternNode);
- }
-
</del><span class="cx"> inline ObjectPatternNode::ObjectPatternNode()
</span><span class="cx"> : DestructuringPatternNode()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline Ref<ObjectPatternNode> ObjectPatternNode::create()
- {
- return adoptRef(*new ObjectPatternNode);
- }
-
- inline Ref<BindingNode> BindingNode::create(const Identifier& boundProperty, const JSTextPosition& start, const JSTextPosition& end, AssignmentContext context)
- {
- return adoptRef(*new BindingNode(boundProperty, start, end, context));
- }
-
</del><span class="cx"> inline BindingNode::BindingNode(const Identifier& boundProperty, const JSTextPosition& start, const JSTextPosition& end, AssignmentContext context)
</span><span class="cx"> : DestructuringPatternNode()
</span><span class="cx"> , m_divotStart(start)
</span><span class="lines">@@ -983,7 +956,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline DestructuringAssignmentNode::DestructuringAssignmentNode(const JSTokenLocation& location, PassRefPtr<DestructuringPatternNode> bindings, ExpressionNode* initializer)
</del><ins>+ inline DestructuringAssignmentNode::DestructuringAssignmentNode(const JSTokenLocation& location, DestructuringPatternNode* bindings, ExpressionNode* initializer)
</ins><span class="cx"> : ExpressionNode(location)
</span><span class="cx"> , m_bindings(bindings)
</span><span class="cx"> , m_initializer(initializer)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/Nodes.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> // ------------------------------ ProgramNode -----------------------------
</span><span class="cx">
</span><del>-ProgramNode::ProgramNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VariableEnvironment& varEnvironment, FunctionStack& funcStack, VariableEnvironment& lexicalVariables, const SourceCode& source, CodeFeatures features, int numConstants)
</del><ins>+ProgramNode::ProgramNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VariableEnvironment& varEnvironment, FunctionStack& funcStack, VariableEnvironment& lexicalVariables, FunctionParameters*, const SourceCode& source, CodeFeatures features, int numConstants)
</ins><span class="cx"> : ScopeNode(parserArena, startLocation, endLocation, source, children, varEnvironment, funcStack, lexicalVariables, features, numConstants)
</span><span class="cx"> , m_startColumn(startColumn)
</span><span class="cx"> , m_endColumn(endColumn)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> // ------------------------------ EvalNode -----------------------------
</span><span class="cx">
</span><del>-EvalNode::EvalNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned, unsigned endColumn, SourceElements* children, VariableEnvironment& varEnvironment, FunctionStack& funcStack, VariableEnvironment& lexicalVariables, const SourceCode& source, CodeFeatures features, int numConstants)
</del><ins>+EvalNode::EvalNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned, unsigned endColumn, SourceElements* children, VariableEnvironment& varEnvironment, FunctionStack& funcStack, VariableEnvironment& lexicalVariables, FunctionParameters*, const SourceCode& source, CodeFeatures features, int numConstants)
</ins><span class="cx"> : ScopeNode(parserArena, startLocation, endLocation, source, children, varEnvironment, funcStack, lexicalVariables, features, numConstants)
</span><span class="cx"> , m_endColumn(endColumn)
</span><span class="cx"> {
</span><span class="lines">@@ -139,39 +139,11 @@
</span><span class="cx">
</span><span class="cx"> // ------------------------------ FunctionBodyNode -----------------------------
</span><span class="cx">
</span><del>-Ref<FunctionParameters> FunctionParameters::create(ParameterNode* firstParameter)
-{
- unsigned parameterCount = 0;
- for (ParameterNode* parameter = firstParameter; parameter; parameter = parameter->nextParam())
- ++parameterCount;
-
- size_t objectSize = sizeof(FunctionParameters) - sizeof(void*) + sizeof(DestructuringPatternNode*) * parameterCount;
- void* slot = fastMalloc(objectSize);
- return adoptRef(*new (slot) FunctionParameters(firstParameter, parameterCount));
-}
-
-FunctionParameters::FunctionParameters(ParameterNode* firstParameter, unsigned size)
- : m_size(size)
-{
- unsigned i = 0;
- for (ParameterNode* parameter = firstParameter; parameter; parameter = parameter->nextParam()) {
- auto pattern = parameter->pattern();
- pattern->ref();
- patterns()[i++] = pattern;
- }
-}
-
-FunctionParameters::~FunctionParameters()
-{
- for (unsigned i = 0; i < m_size; ++i)
- patterns()[i]->deref();
-}
-
</del><span class="cx"> FunctionBodyNode::FunctionBodyNode(
</span><span class="cx"> ParserArena&, const JSTokenLocation& startLocation,
</span><span class="cx"> const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn,
</span><del>- int functionKeywordStart, int functionNameStart, int parametersStart,
- bool isInStrictContext, ConstructorKind constructorKind)
</del><ins>+ int functionKeywordStart, int functionNameStart, int parametersStart, bool isInStrictContext,
+ ConstructorKind constructorKind, unsigned parameterCount, FunctionParseMode mode)
</ins><span class="cx"> : StatementNode(endLocation)
</span><span class="cx"> , m_startColumn(startColumn)
</span><span class="cx"> , m_endColumn(endColumn)
</span><span class="lines">@@ -179,16 +151,17 @@
</span><span class="cx"> , m_functionNameStart(functionNameStart)
</span><span class="cx"> , m_parametersStart(parametersStart)
</span><span class="cx"> , m_startStartOffset(startLocation.startOffset)
</span><ins>+ , m_parameterCount(parameterCount)
+ , m_parseMode(mode)
</ins><span class="cx"> , m_isInStrictContext(isInStrictContext)
</span><span class="cx"> , m_constructorKind(static_cast<unsigned>(constructorKind))
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_constructorKind == static_cast<unsigned>(constructorKind));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FunctionBodyNode::finishParsing(const SourceCode& source, ParameterNode* firstParameter, const Identifier& ident, enum FunctionMode functionMode)
</del><ins>+void FunctionBodyNode::finishParsing(const SourceCode& source, const Identifier& ident, enum FunctionMode functionMode)
</ins><span class="cx"> {
</span><span class="cx"> m_source = source;
</span><del>- m_parameters = FunctionParameters::create(firstParameter);
</del><span class="cx"> m_ident = ident;
</span><span class="cx"> m_functionMode = functionMode;
</span><span class="cx"> }
</span><span class="lines">@@ -201,17 +174,17 @@
</span><span class="cx">
</span><span class="cx"> // ------------------------------ FunctionNode -----------------------------
</span><span class="cx">
</span><del>-FunctionNode::FunctionNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VariableEnvironment& varEnvironment, FunctionStack& funcStack, VariableEnvironment& lexicalVariables, const SourceCode& sourceCode, CodeFeatures features, int numConstants)
</del><ins>+FunctionNode::FunctionNode(ParserArena& parserArena, const JSTokenLocation& startLocation, const JSTokenLocation& endLocation, unsigned startColumn, unsigned endColumn, SourceElements* children, VariableEnvironment& varEnvironment, FunctionStack& funcStack, VariableEnvironment& lexicalVariables, FunctionParameters* parameters, const SourceCode& sourceCode, CodeFeatures features, int numConstants)
</ins><span class="cx"> : ScopeNode(parserArena, startLocation, endLocation, sourceCode, children, varEnvironment, funcStack, lexicalVariables, features, numConstants)
</span><ins>+ , m_parameters(parameters)
</ins><span class="cx"> , m_startColumn(startColumn)
</span><span class="cx"> , m_endColumn(endColumn)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FunctionNode::finishParsing(PassRefPtr<FunctionParameters> parameters, const Identifier& ident, enum FunctionMode functionMode)
</del><ins>+void FunctionNode::finishParsing(const Identifier& ident, enum FunctionMode functionMode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!source().isNull());
</span><del>- m_parameters = parameters;
</del><span class="cx"> m_ident = ident;
</span><span class="cx"> m_functionMode = functionMode;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> class ArgumentListNode;
</span><span class="cx"> class BytecodeGenerator;
</span><span class="cx"> class FunctionBodyNode;
</span><ins>+ class FunctionParameters;
</ins><span class="cx"> class Label;
</span><span class="cx"> class PropertyListNode;
</span><span class="cx"> class ReadModifyResolveNode;
</span><span class="lines">@@ -1541,19 +1542,6 @@
</span><span class="cx"> StatementNode* m_finallyBlock;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class ParameterNode : public ParserArenaDeletable {
- public:
- ParameterNode(PassRefPtr<DestructuringPatternNode>);
- ParameterNode(ParameterNode*, PassRefPtr<DestructuringPatternNode>);
-
- DestructuringPatternNode* pattern() const { return m_pattern.get(); }
- ParameterNode* nextParam() const { return m_next; }
-
- private:
- RefPtr<DestructuringPatternNode> m_pattern;
- ParameterNode* m_next;
- };
-
</del><span class="cx"> class ScopeNode : public StatementNode, public ParserArenaRoot, public VariableEnvironmentNode {
</span><span class="cx"> public:
</span><span class="cx"> typedef DeclarationStacks::FunctionStack FunctionStack;
</span><span class="lines">@@ -1619,7 +1607,7 @@
</span><span class="cx">
</span><span class="cx"> class ProgramNode : public ScopeNode {
</span><span class="cx"> public:
</span><del>- ProgramNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VariableEnvironment&, FunctionStack&, VariableEnvironment&, const SourceCode&, CodeFeatures, int numConstants);
</del><ins>+ ProgramNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VariableEnvironment&, FunctionStack&, VariableEnvironment&, FunctionParameters*, const SourceCode&, CodeFeatures, int numConstants);
</ins><span class="cx">
</span><span class="cx"> unsigned startColumn() const { return m_startColumn; }
</span><span class="cx"> unsigned endColumn() const { return m_endColumn; }
</span><span class="lines">@@ -1638,7 +1626,7 @@
</span><span class="cx">
</span><span class="cx"> class EvalNode : public ScopeNode {
</span><span class="cx"> public:
</span><del>- EvalNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VariableEnvironment&, FunctionStack&, VariableEnvironment&, const SourceCode&, CodeFeatures, int numConstants);
</del><ins>+ EvalNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VariableEnvironment&, FunctionStack&, VariableEnvironment&, FunctionParameters*, const SourceCode&, CodeFeatures, int numConstants);
</ins><span class="cx">
</span><span class="cx"> ALWAYS_INLINE unsigned startColumn() const { return 0; }
</span><span class="cx"> unsigned endColumn() const { return m_endColumn; }
</span><span class="lines">@@ -1651,23 +1639,16 @@
</span><span class="cx"> unsigned m_endColumn;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class FunctionParameters : public RefCounted<FunctionParameters> {
- WTF_MAKE_FAST_ALLOCATED;
- WTF_MAKE_NONCOPYABLE(FunctionParameters);
</del><ins>+ class FunctionParameters : public ParserArenaDeletable {
</ins><span class="cx"> public:
</span><del>- static Ref<FunctionParameters> create(ParameterNode*);
- ~FunctionParameters();
</del><ins>+ FunctionParameters();
+ ALWAYS_INLINE unsigned size() const { return m_patterns.size(); }
+ ALWAYS_INLINE DestructuringPatternNode* at(unsigned index) { return m_patterns[index]; }
+ ALWAYS_INLINE void append(DestructuringPatternNode* pattern) { ASSERT(pattern); m_patterns.append(pattern); }
</ins><span class="cx">
</span><del>- unsigned size() const { return m_size; }
- DestructuringPatternNode* at(unsigned index) { ASSERT(index < m_size); return patterns()[index]; }
-
</del><span class="cx"> private:
</span><del>- FunctionParameters(ParameterNode*, unsigned size);
</del><span class="cx">
</span><del>- DestructuringPatternNode** patterns() { return &m_storage; }
-
- unsigned m_size;
- DestructuringPatternNode* m_storage;
</del><ins>+ Vector<DestructuringPatternNode*, 3> m_patterns;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class FunctionBodyNode final : public StatementNode, public ParserArenaDeletable {
</span><span class="lines">@@ -1678,13 +1659,11 @@
</span><span class="cx"> ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end,
</span><span class="cx"> unsigned startColumn, unsigned endColumn, int functionKeywordStart,
</span><span class="cx"> int functionNameStart, int parametersStart, bool isInStrictContext,
</span><del>- ConstructorKind);
</del><ins>+ ConstructorKind, unsigned, FunctionParseMode);
</ins><span class="cx">
</span><del>- FunctionParameters* parameters() const { return m_parameters.get(); }
-
</del><span class="cx"> virtual void emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
</span><span class="cx">
</span><del>- void finishParsing(const SourceCode&, ParameterNode*, const Identifier&, FunctionMode);
</del><ins>+ void finishParsing(const SourceCode&, const Identifier&, FunctionMode);
</ins><span class="cx">
</span><span class="cx"> void overrideName(const Identifier& ident) { m_ident = ident; }
</span><span class="cx"> const Identifier& ident() { return m_ident; }
</span><span class="lines">@@ -1698,6 +1677,8 @@
</span><span class="cx"> int parametersStart() const { return m_parametersStart; }
</span><span class="cx"> unsigned startColumn() const { return m_startColumn; }
</span><span class="cx"> unsigned endColumn() const { return m_endColumn; }
</span><ins>+ unsigned parameterCount() const { return m_parameterCount; }
+ FunctionParseMode parseMode() const { return m_parseMode; }
</ins><span class="cx">
</span><span class="cx"> void setEndPosition(JSTextPosition);
</span><span class="cx">
</span><span class="lines">@@ -1711,7 +1692,6 @@
</span><span class="cx"> Identifier m_ident;
</span><span class="cx"> Identifier m_inferredName;
</span><span class="cx"> FunctionMode m_functionMode;
</span><del>- RefPtr<FunctionParameters> m_parameters;
</del><span class="cx"> unsigned m_startColumn;
</span><span class="cx"> unsigned m_endColumn;
</span><span class="cx"> int m_functionKeywordStart;
</span><span class="lines">@@ -1719,19 +1699,21 @@
</span><span class="cx"> int m_parametersStart;
</span><span class="cx"> SourceCode m_source;
</span><span class="cx"> int m_startStartOffset;
</span><ins>+ unsigned m_parameterCount;
+ FunctionParseMode m_parseMode;
</ins><span class="cx"> unsigned m_isInStrictContext : 1;
</span><span class="cx"> unsigned m_constructorKind : 2;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class FunctionNode final : public ScopeNode {
</span><span class="cx"> public:
</span><del>- FunctionNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VariableEnvironment&, FunctionStack&, VariableEnvironment&, const SourceCode&, CodeFeatures, int numConstants);
</del><ins>+ FunctionNode(ParserArena&, const JSTokenLocation& start, const JSTokenLocation& end, unsigned startColumn, unsigned endColumn, SourceElements*, VariableEnvironment&, FunctionStack&, VariableEnvironment&, FunctionParameters*, const SourceCode&, CodeFeatures, int numConstants);
</ins><span class="cx">
</span><del>- FunctionParameters* parameters() const { return m_parameters.get(); }
</del><ins>+ FunctionParameters* parameters() const { return m_parameters; }
</ins><span class="cx">
</span><span class="cx"> virtual void emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
</span><span class="cx">
</span><del>- void finishParsing(PassRefPtr<FunctionParameters>, const Identifier&, FunctionMode);
</del><ins>+ void finishParsing(const Identifier&, FunctionMode);
</ins><span class="cx">
</span><span class="cx"> const Identifier& ident() { return m_ident; }
</span><span class="cx">
</span><span class="lines">@@ -1745,14 +1727,14 @@
</span><span class="cx"> private:
</span><span class="cx"> Identifier m_ident;
</span><span class="cx"> FunctionMode m_functionMode;
</span><del>- RefPtr<FunctionParameters> m_parameters;
</del><ins>+ FunctionParameters* m_parameters;
</ins><span class="cx"> unsigned m_startColumn;
</span><span class="cx"> unsigned m_endColumn;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class FuncExprNode : public ExpressionNode {
</span><span class="cx"> public:
</span><del>- FuncExprNode(const JSTokenLocation&, const Identifier&, FunctionBodyNode*, const SourceCode&, ParameterNode* = 0);
</del><ins>+ FuncExprNode(const JSTokenLocation&, const Identifier&, FunctionBodyNode*, const SourceCode&);
</ins><span class="cx">
</span><span class="cx"> FunctionBodyNode* body() { return m_body; }
</span><span class="cx">
</span><span class="lines">@@ -1783,11 +1765,9 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- class DestructuringPatternNode : public RefCounted<DestructuringPatternNode> {
- WTF_MAKE_NONCOPYABLE(DestructuringPatternNode);
- WTF_MAKE_FAST_ALLOCATED;
-
</del><ins>+ class DestructuringPatternNode : public ParserArenaDeletable {
</ins><span class="cx"> public:
</span><ins>+ virtual ~DestructuringPatternNode() { }
</ins><span class="cx"> virtual void collectBoundIdentifiers(Vector<Identifier>&) const = 0;
</span><span class="cx"> virtual void bindValue(BytecodeGenerator&, RegisterID* source) const = 0;
</span><span class="cx"> virtual void toString(StringBuilder&) const = 0;
</span><span class="lines">@@ -1795,21 +1775,19 @@
</span><span class="cx"> virtual bool isBindingNode() const { return false; }
</span><span class="cx"> virtual RegisterID* emitDirectBinding(BytecodeGenerator&, RegisterID*, ExpressionNode*) { return 0; }
</span><span class="cx">
</span><del>- virtual ~DestructuringPatternNode() = 0;
-
</del><span class="cx"> protected:
</span><span class="cx"> DestructuringPatternNode();
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ArrayPatternNode : public DestructuringPatternNode, public ThrowableExpressionData {
</span><span class="cx"> public:
</span><ins>+ ArrayPatternNode();
</ins><span class="cx"> enum class BindingType {
</span><span class="cx"> Elision,
</span><span class="cx"> Element,
</span><span class="cx"> RestElement
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static Ref<ArrayPatternNode> create();
</del><span class="cx"> void appendIndex(BindingType bindingType, const JSTokenLocation&, DestructuringPatternNode* node, ExpressionNode* defaultValue)
</span><span class="cx"> {
</span><span class="cx"> m_targetPatterns.append({ bindingType, node, defaultValue });
</span><span class="lines">@@ -1818,10 +1796,9 @@
</span><span class="cx"> private:
</span><span class="cx"> struct Entry {
</span><span class="cx"> BindingType bindingType;
</span><del>- RefPtr<DestructuringPatternNode> pattern;
</del><ins>+ DestructuringPatternNode* pattern;
</ins><span class="cx"> ExpressionNode* defaultValue;
</span><span class="cx"> };
</span><del>- ArrayPatternNode();
</del><span class="cx"> virtual void collectBoundIdentifiers(Vector<Identifier>&) const override;
</span><span class="cx"> virtual void bindValue(BytecodeGenerator&, RegisterID*) const override;
</span><span class="cx"> virtual RegisterID* emitDirectBinding(BytecodeGenerator&, RegisterID* dst, ExpressionNode*) override;
</span><span class="lines">@@ -1832,21 +1809,20 @@
</span><span class="cx">
</span><span class="cx"> class ObjectPatternNode : public DestructuringPatternNode {
</span><span class="cx"> public:
</span><del>- static Ref<ObjectPatternNode> create();
</del><ins>+ ObjectPatternNode();
</ins><span class="cx"> void appendEntry(const JSTokenLocation&, const Identifier& identifier, bool wasString, DestructuringPatternNode* pattern, ExpressionNode* defaultValue)
</span><span class="cx"> {
</span><span class="cx"> m_targetPatterns.append(Entry{ identifier, wasString, pattern, defaultValue });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ObjectPatternNode();
</del><span class="cx"> virtual void collectBoundIdentifiers(Vector<Identifier>&) const override;
</span><span class="cx"> virtual void bindValue(BytecodeGenerator&, RegisterID*) const override;
</span><span class="cx"> virtual void toString(StringBuilder&) const override;
</span><span class="cx"> struct Entry {
</span><span class="cx"> Identifier propertyName;
</span><span class="cx"> bool wasString;
</span><del>- RefPtr<DestructuringPatternNode> pattern;
</del><ins>+ DestructuringPatternNode* pattern;
</ins><span class="cx"> ExpressionNode* defaultValue;
</span><span class="cx"> };
</span><span class="cx"> Vector<Entry> m_targetPatterns;
</span><span class="lines">@@ -1854,15 +1830,13 @@
</span><span class="cx">
</span><span class="cx"> class BindingNode : public DestructuringPatternNode {
</span><span class="cx"> public:
</span><del>- static Ref<BindingNode> create(const Identifier& boundProperty, const JSTextPosition& start, const JSTextPosition& end, AssignmentContext);
</del><ins>+ BindingNode(const Identifier& boundProperty, const JSTextPosition& start, const JSTextPosition& end, AssignmentContext);
</ins><span class="cx"> const Identifier& boundProperty() const { return m_boundProperty; }
</span><span class="cx">
</span><span class="cx"> const JSTextPosition& divotStart() const { return m_divotStart; }
</span><span class="cx"> const JSTextPosition& divotEnd() const { return m_divotEnd; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- BindingNode(const Identifier& boundProperty, const JSTextPosition& start, const JSTextPosition& end, AssignmentContext);
-
</del><span class="cx"> virtual void collectBoundIdentifiers(Vector<Identifier>&) const override;
</span><span class="cx"> virtual void bindValue(BytecodeGenerator&, RegisterID*) const override;
</span><span class="cx"> virtual void toString(StringBuilder&) const override;
</span><span class="lines">@@ -1877,8 +1851,8 @@
</span><span class="cx">
</span><span class="cx"> class DestructuringAssignmentNode : public ExpressionNode, public ParserArenaDeletable {
</span><span class="cx"> public:
</span><del>- DestructuringAssignmentNode(const JSTokenLocation&, PassRefPtr<DestructuringPatternNode>, ExpressionNode*);
- DestructuringPatternNode* bindings() { return m_bindings.get(); }
</del><ins>+ DestructuringAssignmentNode(const JSTokenLocation&, DestructuringPatternNode*, ExpressionNode*);
+ DestructuringPatternNode* bindings() { return m_bindings; }
</ins><span class="cx">
</span><span class="cx"> using ParserArenaDeletable::operator new;
</span><span class="cx">
</span><span class="lines">@@ -1887,13 +1861,13 @@
</span><span class="cx"> virtual bool isDestructuringNode() const override { return true; }
</span><span class="cx"> virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
</span><span class="cx">
</span><del>- RefPtr<DestructuringPatternNode> m_bindings;
</del><ins>+ DestructuringPatternNode* m_bindings;
</ins><span class="cx"> ExpressionNode* m_initializer;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class FuncDeclNode : public StatementNode {
</span><span class="cx"> public:
</span><del>- FuncDeclNode(const JSTokenLocation&, const Identifier&, FunctionBodyNode*, const SourceCode&, ParameterNode* = 0);
</del><ins>+ FuncDeclNode(const JSTokenLocation&, const Identifier&, FunctionBodyNode*, const SourceCode&);
</ins><span class="cx">
</span><span class="cx"> virtual bool isFuncDeclNode() const override { return true; }
</span><span class="cx"> FunctionBodyNode* body() { return m_body; }
</span><span class="lines">@@ -1989,11 +1963,6 @@
</span><span class="cx"> ConstDeclNode* tail;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- struct ParameterList {
- ParameterNode* head;
- ParameterNode* tail;
- };
-
</del><span class="cx"> struct ClauseList {
</span><span class="cx"> ClauseListNode* head;
</span><span class="cx"> ClauseListNode* tail;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -191,8 +191,7 @@
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><span class="cx"> Parser<LexerType>::Parser(
</span><del>- VM* vm, const SourceCode& source, FunctionParameters* parameters,
- const Identifier& name, JSParserBuiltinMode builtinMode,
</del><ins>+ VM* vm, const SourceCode& source, JSParserBuiltinMode builtinMode,
</ins><span class="cx"> JSParserStrictMode strictMode, JSParserCodeType codeType,
</span><span class="cx"> ConstructorKind defaultConstructorKind, ThisTDZMode thisTDZMode)
</span><span class="cx"> : m_vm(vm)
</span><span class="lines">@@ -223,30 +222,7 @@
</span><span class="cx"> scope->setIsFunction();
</span><span class="cx"> if (strictMode == JSParserStrictMode::Strict)
</span><span class="cx"> scope->setStrictMode();
</span><del>- if (parameters) {
- bool hadBindingParameters = false;
- for (unsigned i = 0; i < parameters->size(); i++) {
- auto parameter = parameters->at(i);
- if (!parameter->isBindingNode()) {
- hadBindingParameters = true;
- continue;
- }
- scope->declareParameter(&static_cast<BindingNode*>(parameter)->boundProperty());
- }
- if (hadBindingParameters) {
- Vector<Identifier> boundParameterNames;
- for (unsigned i = 0; i < parameters->size(); i++) {
- auto parameter = parameters->at(i);
- if (parameter->isBindingNode())
- continue;
- parameter->collectBoundIdentifiers(boundParameterNames);
- }
- for (auto& boundParameterName : boundParameterNames)
- scope->declareVariable(&boundParameterName);
- }
- }
- if (!name.isNull())
- scope->declareCallee(&name);
</del><ins>+
</ins><span class="cx"> next();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -256,18 +232,56 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-String Parser<LexerType>::parseInner()
</del><ins>+String Parser<LexerType>::parseInner(const Identifier& calleeName, FunctionParseMode parseMode)
</ins><span class="cx"> {
</span><span class="cx"> String parseError = String();
</span><span class="cx">
</span><span class="cx"> ASTBuilder context(const_cast<VM*>(m_vm), m_parserArena, const_cast<SourceCode*>(m_source));
</span><del>- if (m_lexer->isReparsing())
- m_statementDepth--;
</del><span class="cx"> ScopeRef scope = currentScope();
</span><span class="cx"> scope->setIsLexicalScope();
</span><span class="cx">
</span><del>- SourceElements* sourceElements = parseSourceElements(context, CheckForStrictMode, StandardFunctionParseType);
- if (!sourceElements || !consume(EOFTOK)) {
</del><ins>+ bool isArrowFunctionBodyExpression = false;
+ if (m_lexer->isReparsingFunction()) {
+ ParserFunctionInfo<ASTBuilder> functionInfo;
+ parseFunctionParameters(context, parseMode, functionInfo);
+ m_parameters = functionInfo.parameters;
+
+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
+ if (parseMode == ArrowFunctionMode && !hasError()) {
+ // The only way we could have an error wile reparsing is if we run out of stack space.
+ RELEASE_ASSERT(match(ARROWFUNCTION));
+ next();
+ isArrowFunctionBodyExpression = !match(OPENBRACE);
+ }
+#endif
+ }
+
+ if (!calleeName.isNull())
+ scope->declareCallee(&calleeName);
+
+ if (m_lexer->isReparsingFunction())
+ m_statementDepth--;
+
+ SourceElements* sourceElements = nullptr;
+ // The only way we can error this early is if we reparse a function and we run out of stack space.
+ if (!hasError()) {
+ if (isArrowFunctionBodyExpression)
+ sourceElements = parseArrowFunctionSingleExpressionBodySourceElements(context);
+ else
+ sourceElements = parseSourceElements(context, CheckForStrictMode);
+ }
+
+ bool validEnding;
+ if (isArrowFunctionBodyExpression) {
+ ASSERT(m_lexer->isReparsingFunction());
+ // When we reparse and stack overflow, we're not guaranteed a valid ending. If we don't run out of stack space,
+ // then of course this will always be valid because we already parsed for syntax errors. But we must
+ // be cautious in case we run out of stack space.
+ validEnding = isEndOfArrowFunction();
+ } else
+ validEnding = consume(EOFTOK);
+
+ if (!sourceElements || !validEnding) {
</ins><span class="cx"> if (hasError())
</span><span class="cx"> parseError = m_errorMessage;
</span><span class="cx"> else
</span><span class="lines">@@ -346,7 +360,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceElements(TreeBuilder& context, SourceElementsMode mode, FunctionParseType functionParseType)
</del><ins>+template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceElements(TreeBuilder& context, SourceElementsMode mode)
</ins><span class="cx"> {
</span><span class="cx"> const unsigned lengthOfUseStrictLiteral = 12; // "use strict".length
</span><span class="cx"> TreeSourceElements sourceElements = context.createSourceElements();
</span><span class="lines">@@ -356,22 +370,6 @@
</span><span class="cx"> auto savePoint = createSavePoint();
</span><span class="cx"> bool hasSetStrict = false;
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- if (match(ARROWFUNCTION)) {
- TreeStatement arrowfunctionStatement = parseArrowFunctionSingleExpressionBody(context, functionParseType);
-
- if (arrowfunctionStatement) {
- context.setEndOffset(arrowfunctionStatement, m_lastTokenEndPosition.offset);
- context.appendStatement(sourceElements, arrowfunctionStatement);
- }
-
- propagateError();
- return sourceElements;
- }
-#else
- UNUSED_PARAM(functionParseType);
-#endif
-
</del><span class="cx"> while (TreeStatement statement = parseStatementListItem(context, directive, &directiveLiteralLength)) {
</span><span class="cx"> if (mode == CheckForStrictMode && !seenNonDirective) {
</span><span class="cx"> if (directive) {
</span><span class="lines">@@ -662,25 +660,14 @@
</span><span class="cx"> return context.createBindingLocation(token.m_location, name, token.m_startPosition, token.m_endPosition, bindingContext);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> template <typename LexerType>
</span><del>-template <class TreeBuilder> TreeStatement Parser<LexerType>::parseArrowFunctionSingleExpressionBody(TreeBuilder& context, FunctionParseType parseType)
</del><ins>+template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseArrowFunctionSingleExpressionBodySourceElements(TreeBuilder& context)
</ins><span class="cx"> {
</span><del>- ASSERT(match(ARROWFUNCTION));
</del><ins>+ ASSERT(!match(OPENBRACE));
</ins><span class="cx">
</span><del>- // When reparsing phase, parseType becomes StandardFunctionParseType even if the function is arrow function.
- // This condition considers the following situations.
- // (1): If we are in the reparsing phase, this arrow function is already parsed once, so there is no syntax error.
- // (2): But if we are not in the reparsing phase, we should check this function is called in the context of the arrow function.
- if (!m_lexer->isReparsing() && parseType != ArrowFunctionParseType)
- failDueToUnexpectedToken();
-
</del><span class="cx"> JSTokenLocation location(tokenLocation());
</span><span class="cx"> JSTextPosition start = tokenStartPosition();
</span><del>- JSTextPosition end = tokenEndPosition();
</del><span class="cx">
</span><del>- next();
-
</del><span class="cx"> failIfStackOverflow();
</span><span class="cx"> TreeExpression expr = parseAssignmentExpression(context);
</span><span class="cx"> failIfFalse(expr, "Cannot parse the arrow function expression");
</span><span class="lines">@@ -689,14 +676,18 @@
</span><span class="cx">
</span><span class="cx"> failIfFalse(isEndOfArrowFunction(), "Expected a ';', ']', '}', ')', ',', line terminator or EOF following a arrow function statement");
</span><span class="cx">
</span><del>- end = tokenEndPosition();
</del><ins>+ JSTextPosition end = tokenEndPosition();
</ins><span class="cx">
</span><span class="cx"> if (!m_lexer->prevTerminator())
</span><span class="cx"> setEndOfStatement();
</span><span class="cx">
</span><del>- return context.createReturnStatement(location, expr, start, end);
</del><ins>+ TreeSourceElements sourceElements = context.createSourceElements();
+ TreeStatement body = context.createReturnStatement(location, expr, start, end);
+ context.setEndOffset(body, m_lastTokenEndPosition.offset);
+ context.appendStatement(sourceElements, body);
+
+ return sourceElements;
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><span class="cx"> template <class TreeBuilder> TreeDestructuringPattern Parser<LexerType>::tryParseDestructuringPatternExpression(TreeBuilder& context, AssignmentContext bindingContext)
</span><span class="lines">@@ -1229,7 +1220,7 @@
</span><span class="cx"> TreeExpression condition = parseExpression(context);
</span><span class="cx"> failIfFalse(condition, "Cannot parse switch clause");
</span><span class="cx"> consumeOrFail(COLON, "Expected a ':' after switch clause expression");
</span><del>- TreeSourceElements statements = parseSourceElements(context, DontCheckForStrictMode, StandardFunctionParseType);
</del><ins>+ TreeSourceElements statements = parseSourceElements(context, DontCheckForStrictMode);
</ins><span class="cx"> failIfFalse(statements, "Cannot parse the body of a switch clause");
</span><span class="cx"> TreeClause clause = context.createClause(condition, statements);
</span><span class="cx"> context.setStartOffset(clause, startOffset);
</span><span class="lines">@@ -1242,7 +1233,7 @@
</span><span class="cx"> TreeExpression condition = parseExpression(context);
</span><span class="cx"> failIfFalse(condition, "Cannot parse switch case expression");
</span><span class="cx"> consumeOrFail(COLON, "Expected a ':' after switch clause expression");
</span><del>- TreeSourceElements statements = parseSourceElements(context, DontCheckForStrictMode, StandardFunctionParseType);
</del><ins>+ TreeSourceElements statements = parseSourceElements(context, DontCheckForStrictMode);
</ins><span class="cx"> failIfFalse(statements, "Cannot parse the body of a switch clause");
</span><span class="cx"> clause = context.createClause(condition, statements);
</span><span class="cx"> context.setStartOffset(clause, startOffset);
</span><span class="lines">@@ -1259,7 +1250,7 @@
</span><span class="cx"> unsigned startOffset = tokenStart();
</span><span class="cx"> next();
</span><span class="cx"> consumeOrFail(COLON, "Expected a ':' after switch default clause");
</span><del>- TreeSourceElements statements = parseSourceElements(context, DontCheckForStrictMode, StandardFunctionParseType);
</del><ins>+ TreeSourceElements statements = parseSourceElements(context, DontCheckForStrictMode);
</ins><span class="cx"> failIfFalse(statements, "Cannot parse the body of a switch default clause");
</span><span class="cx"> TreeClause result = context.createClause(0, statements);
</span><span class="cx"> context.setStartOffset(result, startOffset);
</span><span class="lines">@@ -1358,7 +1349,7 @@
</span><span class="cx"> popScope(lexicalScope, TreeBuilder::NeedsFreeVariableInfo);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>- TreeSourceElements subtree = parseSourceElements(context, DontCheckForStrictMode, StandardFunctionParseType);
</del><ins>+ TreeSourceElements subtree = parseSourceElements(context, DontCheckForStrictMode);
</ins><span class="cx"> failIfFalse(subtree, "Cannot parse the body of the block statement");
</span><span class="cx"> matchOrFail(CLOSEBRACE, "Expected a closing '}' at the end of a block statement");
</span><span class="cx"> int endOffset = m_token.m_data.offset;
</span><span class="lines">@@ -1466,46 +1457,43 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <class TreeBuilder> TreeFormalParameterList Parser<LexerType>::parseFormalParameters(TreeBuilder& context)
</del><ins>+template <class TreeBuilder> bool Parser<LexerType>::parseFormalParameters(TreeBuilder& context, TreeFormalParameterList list, unsigned& parameterCount)
</ins><span class="cx"> {
</span><span class="cx"> auto parameter = parseDestructuringPattern(context, DestructureToParameters);
</span><span class="cx"> failIfFalse(parameter, "Cannot parse parameter pattern");
</span><del>- TreeFormalParameterList list = context.createFormalParameterList(parameter);
- TreeFormalParameterList tail = list;
</del><ins>+ context.appendParameter(list, parameter);
+ parameterCount++;
</ins><span class="cx"> while (consume(COMMA)) {
</span><span class="cx"> parameter = parseDestructuringPattern(context, DestructureToParameters);
</span><span class="cx"> failIfFalse(parameter, "Cannot parse parameter pattern");
</span><del>- tail = context.createFormalParameterList(tail, parameter);
</del><ins>+ context.appendParameter(list, parameter);
+ parameterCount++;
</ins><span class="cx"> }
</span><del>- return list;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><span class="cx"> template <class TreeBuilder> TreeFunctionBody Parser<LexerType>::parseFunctionBody(
</span><del>- TreeBuilder& context, int functionKeywordStart, int functionNameStart,
- int parametersStart, ConstructorKind constructorKind, FunctionParseType parseType)
</del><ins>+ TreeBuilder& context, const JSTokenLocation& startLocation, int startColumn, int functionKeywordStart, int functionNameStart, int parametersStart,
+ ConstructorKind constructorKind, FunctionBodyType bodyType, unsigned parameterCount, FunctionParseMode parseMode)
</ins><span class="cx"> {
</span><del>- JSTokenLocation startLocation(tokenLocation());
- unsigned startColumn = tokenColumn();
-
- if (parseType == StandardFunctionParseType) {
</del><ins>+ if (bodyType == StandardFunctionBodyBlock || bodyType == ArrowFunctionBodyBlock) {
</ins><span class="cx"> next();
</span><span class="cx"> if (match(CLOSEBRACE)) {
</span><span class="cx"> unsigned endColumn = tokenColumn();
</span><del>- return context.createFunctionBody(startLocation, tokenLocation(), startColumn, endColumn, functionKeywordStart, functionNameStart, parametersStart, strictMode(), constructorKind);
</del><ins>+ return context.createFunctionBody(startLocation, tokenLocation(), startColumn, endColumn, functionKeywordStart, functionNameStart, parametersStart, strictMode(), constructorKind, parameterCount, parseMode);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DepthManager statementDepth(&m_statementDepth);
</span><span class="cx"> m_statementDepth = 0;
</span><del>- typename TreeBuilder::FunctionBodyBuilder bodyBuilder(const_cast<VM*>(m_vm), m_lexer.get());
-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- failIfFalse(parseSourceElements(bodyBuilder, CheckForStrictMode, parseType), parseType == StandardFunctionParseType ? "Cannot parse body of this function" : "Cannot parse body of this arrow function");
-#else
- failIfFalse(parseSourceElements(bodyBuilder, CheckForStrictMode, StandardFunctionParseType), "Cannot parse body of this function");
-#endif
</del><ins>+ SyntaxChecker syntaxChecker(const_cast<VM*>(m_vm), m_lexer.get());
+ 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");
</ins><span class="cx"> unsigned endColumn = tokenColumn();
</span><del>- return context.createFunctionBody(startLocation, tokenLocation(), startColumn, endColumn, functionKeywordStart, functionNameStart, parametersStart, strictMode(), constructorKind);
</del><ins>+ return context.createFunctionBody(startLocation, tokenLocation(), startColumn, endColumn, functionKeywordStart, functionNameStart, parametersStart, strictMode(), constructorKind, parameterCount, parseMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const char* stringForFunctionMode(FunctionParseMode mode)
</span><span class="lines">@@ -1515,24 +1503,28 @@
</span><span class="cx"> return "getter";
</span><span class="cx"> case SetterMode:
</span><span class="cx"> return "setter";
</span><del>- case FunctionMode:
</del><ins>+ case NormalFunctionMode:
</ins><span class="cx"> return "function";
</span><span class="cx"> case MethodMode:
</span><span class="cx"> return "method";
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> case ArrowFunctionMode:
</span><span class="cx"> return "arrow function";
</span><del>-#endif
</del><ins>+ case NotAFunctionMode:
+ RELEASE_ASSERT_NOT_REACHED();
+ return "";
</ins><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template <typename LexerType> template <class TreeBuilder> int Parser<LexerType>::parseFunctionParameters(TreeBuilder& context, FunctionParseMode mode, ParserFunctionInfo<TreeBuilder>& info)
</del><ins>+template <typename LexerType> template <class TreeBuilder> int Parser<LexerType>::parseFunctionParameters(TreeBuilder& context, FunctionParseMode mode, ParserFunctionInfo<TreeBuilder>& functionInfo)
</ins><span class="cx"> {
</span><ins>+ RELEASE_ASSERT(mode != NotAFunctionMode);
</ins><span class="cx"> int parametersStart = m_token.m_location.startOffset;
</span><ins>+ TreeFormalParameterList parameterList = context.createFormalParameterList();
+ functionInfo.parameters = parameterList;
+ functionInfo.startOffset = parametersStart;
</ins><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> if (mode == ArrowFunctionMode) {
</span><span class="cx"> if (!match(IDENT) && !match(OPENPAREN)) {
</span><span class="cx"> semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
</span><span class="lines">@@ -1541,76 +1533,87 @@
</span><span class="cx"> if (match(OPENPAREN)) {
</span><span class="cx"> next();
</span><span class="cx">
</span><del>- if (!match(CLOSEPAREN)) {
- info.parameters = parseFormalParameters(context);
- failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
- }
</del><ins>+ if (match(CLOSEPAREN))
+ functionInfo.parameterCount = 0;
+ else
+ failIfFalse(parseFormalParameters(context, parameterList, functionInfo.parameterCount), "Cannot parse parameters for this ", stringForFunctionMode(mode));
</ins><span class="cx">
</span><span class="cx"> consumeOrFail(CLOSEPAREN, "Expected a ')' or a ',' after a parameter declaration");
</span><span class="cx"> } else {
</span><ins>+ functionInfo.parameterCount = 1;
</ins><span class="cx"> auto parameter = parseDestructuringPattern(context, DestructureToParameters);
</span><span class="cx"> failIfFalse(parameter, "Cannot parse parameter pattern");
</span><del>- info.parameters = context.createFormalParameterList(parameter);
- failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
</del><ins>+ context.appendParameter(parameterList, parameter);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return parametersStart;
</span><span class="cx"> }
</span><del>-#endif
-
</del><ins>+
</ins><span class="cx"> if (!consume(OPENPAREN)) {
</span><span class="cx"> semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
</span><span class="cx"> failWithMessage("Expected an opening '(' before a ", stringForFunctionMode(mode), "'s parameter list");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (mode == GetterMode)
</del><ins>+ if (mode == GetterMode) {
</ins><span class="cx"> consumeOrFail(CLOSEPAREN, "getter functions must have no parameters");
</span><del>- else if (mode == SetterMode) {
</del><ins>+ functionInfo.parameterCount = 0;
+ } else if (mode == SetterMode) {
</ins><span class="cx"> failIfTrue(match(CLOSEPAREN), "setter functions must have one parameter");
</span><span class="cx"> auto parameter = parseDestructuringPattern(context, DestructureToParameters);
</span><span class="cx"> failIfFalse(parameter, "setter functions must have one parameter");
</span><del>- info.parameters = context.createFormalParameterList(parameter);
</del><ins>+ context.appendParameter(parameterList, parameter);
+ functionInfo.parameterCount = 1;
</ins><span class="cx"> failIfTrue(match(COMMA), "setter functions must have one parameter");
</span><span class="cx"> consumeOrFail(CLOSEPAREN, "Expected a ')' after a parameter declaration");
</span><span class="cx"> } else {
</span><del>- if (!match(CLOSEPAREN)) {
- info.parameters = parseFormalParameters(context);
- failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
- }
</del><ins>+ if (match(CLOSEPAREN))
+ functionInfo.parameterCount = 0;
+ else
+ failIfFalse(parseFormalParameters(context, parameterList, functionInfo.parameterCount), "Cannot parse parameters for this ", stringForFunctionMode(mode));
</ins><span class="cx"> consumeOrFail(CLOSEPAREN, "Expected a ')' or a ',' after a parameter declaration");
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return parametersStart;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode, bool nameIsInContainingScope, ConstructorKind constructorKind, SuperBinding expectedSuperBinding, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>& info, FunctionParseType parseType)
</del><ins>+template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode, bool nameIsInContainingScope, ConstructorKind constructorKind, SuperBinding expectedSuperBinding, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>& functionInfo, FunctionParseType parseType)
</ins><span class="cx"> {
</span><ins>+ RELEASE_ASSERT(mode != NotAFunctionMode);
+
</ins><span class="cx"> AutoPopScopeRef functionScope(this, pushScope());
</span><span class="cx"> functionScope->setIsFunction();
</span><span class="cx"> int functionNameStart = m_token.m_location.startOffset;
</span><span class="cx"> const Identifier* lastFunctionName = m_lastFunctionName;
</span><span class="cx"> m_lastFunctionName = nullptr;
</span><span class="cx"> int parametersStart;
</span><ins>+ JSTokenLocation startLocation;
+ int startColumn;
+ FunctionBodyType functionBodyType;
</ins><span class="cx">
</span><span class="cx"> switch (parseType) {
</span><span class="cx"> case StandardFunctionParseType: {
</span><ins>+ RELEASE_ASSERT(mode != ArrowFunctionMode);
</ins><span class="cx"> if (match(IDENT) || isLETMaskedAsIDENT()) {
</span><del>- info.name = m_token.m_data.ident;
- m_lastFunctionName = info.name;
</del><ins>+ functionInfo.name = m_token.m_data.ident;
+ m_lastFunctionName = functionInfo.name;
</ins><span class="cx"> next();
</span><span class="cx"> if (!nameIsInContainingScope)
</span><del>- failIfFalseIfStrict(functionScope->declareVariable(info.name), "'", info.name->impl(), "' is not a valid ", stringForFunctionMode(mode), " name in strict mode");
</del><ins>+ failIfFalseIfStrict(functionScope->declareVariable(functionInfo.name), "'", functionInfo.name->impl(), "' is not a valid ", stringForFunctionMode(mode), " name in strict mode");
</ins><span class="cx"> } else if (requirements == FunctionNeedsName) {
</span><del>- if (match(OPENPAREN) && mode == FunctionMode)
</del><ins>+ if (match(OPENPAREN) && mode == NormalFunctionMode)
</ins><span class="cx"> semanticFail("Function statements must have a name");
</span><span class="cx"> semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
</span><span class="cx"> failDueToUnexpectedToken();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
- parametersStart = parseFunctionParameters(context, mode, info);
</del><ins>+
+ startLocation = tokenLocation();
+ functionInfo.startLine = tokenLine();
+ startColumn = tokenColumn();
+
+ parametersStart = parseFunctionParameters(context, mode, functionInfo);
</ins><span class="cx"> propagateError();
</span><span class="cx">
</span><span class="cx"> matchOrFail(OPENBRACE, "Expected an opening '{' at the start of a ", stringForFunctionMode(mode), " body");
</span><span class="lines">@@ -1622,14 +1625,20 @@
</span><span class="cx"> constructorKind = m_defaultConstructorKind;
</span><span class="cx"> expectedSuperBinding = m_defaultConstructorKind == ConstructorKind::Derived ? SuperBinding::Needed : SuperBinding::NotNeeded;
</span><span class="cx"> }
</span><ins>+
+ functionBodyType = StandardFunctionBodyBlock;
</ins><span class="cx">
</span><del>- info.startFunctionOffset = m_token.m_data.offset;
-
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> #if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</span><span class="cx"> case ArrowFunctionParseType: {
</span><del>- parametersStart = parseFunctionParameters(context, ArrowFunctionMode, info);
</del><ins>+ RELEASE_ASSERT(mode == ArrowFunctionMode);
+
+ startLocation = tokenLocation();
+ functionInfo.startLine = tokenLine();
+ startColumn = tokenColumn();
+
+ parametersStart = parseFunctionParameters(context, mode, functionInfo);
</ins><span class="cx"> propagateError();
</span><span class="cx">
</span><span class="cx"> matchOrFail(ARROWFUNCTION, "Expected a '=>' after arrow function parameter declaration");
</span><span class="lines">@@ -1639,30 +1648,25 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(constructorKind == ConstructorKind::None);
</span><span class="cx">
</span><del>- info.arrowFunctionOffset = m_token.m_data.offset;
</del><span class="cx"> // Check if arrow body start with {. If it true it mean that arrow function is Fat arrow function
</span><span class="cx"> // and we need use common approach to parse function body
</span><del>- SavePoint savePoint = createSavePoint();
-
</del><span class="cx"> next();
</span><del>- info.functionBodyType = match(OPENBRACE) ? ArrowFunctionBodyBlock : ArrowFunctionBodyExpression;
- info.startFunctionOffset = (info.functionBodyType == ArrowFunctionBodyBlock) ? m_token.m_data.offset : info.arrowFunctionOffset;
</del><ins>+ functionBodyType = match(OPENBRACE) ? ArrowFunctionBodyBlock : ArrowFunctionBodyExpression;
</ins><span class="cx">
</span><del>- restoreSavePoint(savePoint);
-
</del><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+#else
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isClassConstructor = constructorKind != ConstructorKind::None;
</span><span class="cx">
</span><del>- info.bodyStartLine = tokenLine();
- info.bodyStartColumn = m_token.m_data.offset - m_token.m_data.lineStartOffset;
- JSTokenLocation startLocation(tokenLocation());
</del><ins>+ functionInfo.bodyStartColumn = startColumn;
</ins><span class="cx">
</span><span class="cx"> // If we know about this function already, we can use the cached info and skip the parser to the end of the function.
</span><del>- if (const SourceProviderCacheItem* cachedInfo = TreeBuilder::CanUseFunctionCache ? findCachedFunctionInfo(info.startFunctionOffset) : 0) {
</del><ins>+ if (const SourceProviderCacheItem* cachedInfo = TreeBuilder::CanUseFunctionCache ? findCachedFunctionInfo(functionInfo.startOffset) : 0) {
</ins><span class="cx"> // If we're in a strict context, the cached function info must say it was strict too.
</span><span class="cx"> ASSERT(!strictMode() || cachedInfo->strictMode);
</span><span class="cx"> JSTokenLocation endLocation;
</span><span class="lines">@@ -1671,17 +1675,17 @@
</span><span class="cx"> endLocation.startOffset = cachedInfo->lastTockenStartOffset;
</span><span class="cx"> endLocation.lineStartOffset = cachedInfo->lastTockenLineStartOffset;
</span><span class="cx">
</span><del>- bool endColumnIsOnStartLine = (endLocation.line == info.bodyStartLine);
</del><ins>+ bool endColumnIsOnStartLine = (endLocation.line == functionInfo.startLine);
</ins><span class="cx"> ASSERT(endLocation.startOffset >= endLocation.lineStartOffset);
</span><span class="cx"> unsigned bodyEndColumn = endColumnIsOnStartLine ?
</span><span class="cx"> endLocation.startOffset - m_token.m_data.lineStartOffset :
</span><span class="cx"> endLocation.startOffset - endLocation.lineStartOffset;
</span><span class="cx"> unsigned currentLineStartOffset = m_token.m_location.lineStartOffset;
</span><span class="cx">
</span><del>- info.body = context.createFunctionBody(
- startLocation, endLocation, info.bodyStartColumn, bodyEndColumn,
</del><ins>+ functionInfo.body = context.createFunctionBody(
+ startLocation, endLocation, functionInfo.bodyStartColumn, bodyEndColumn,
</ins><span class="cx"> functionKeywordStart, functionNameStart, parametersStart,
</span><del>- cachedInfo->strictMode, constructorKind);
</del><ins>+ cachedInfo->strictMode, constructorKind, cachedInfo->parameterCount, mode);
</ins><span class="cx">
</span><span class="cx"> functionScope->restoreFromSourceProviderCache(cachedInfo);
</span><span class="cx"> popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo);
</span><span class="lines">@@ -1693,64 +1697,40 @@
</span><span class="cx">
</span><span class="cx"> m_lexer->setOffset(m_token.m_location.endOffset, m_token.m_location.lineStartOffset);
</span><span class="cx"> m_lexer->setLineNumber(m_token.m_location.line);
</span><del>- info.endFunctionOffset = cachedInfo->endFunctionOffset;
-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><ins>+ functionInfo.endOffset = cachedInfo->endFunctionOffset;
+
</ins><span class="cx"> if (parseType == ArrowFunctionParseType)
</span><del>- info.functionBodyType = cachedInfo->isBodyArrowExpression ? ArrowFunctionBodyExpression : ArrowFunctionBodyBlock;
</del><ins>+ functionBodyType = cachedInfo->isBodyArrowExpression ? ArrowFunctionBodyExpression : ArrowFunctionBodyBlock;
</ins><span class="cx"> else
</span><del>- info.functionBodyType = StandardFunctionBodyBlock;
</del><ins>+ functionBodyType = StandardFunctionBodyBlock;
</ins><span class="cx">
</span><del>- switch (info.functionBodyType) {
</del><ins>+ switch (functionBodyType) {
</ins><span class="cx"> case ArrowFunctionBodyExpression:
</span><span class="cx"> next();
</span><del>- context.setEndOffset(info.body, m_lexer->currentOffset());
</del><ins>+ context.setEndOffset(functionInfo.body, m_lexer->currentOffset());
</ins><span class="cx"> break;
</span><span class="cx"> case ArrowFunctionBodyBlock:
</span><span class="cx"> case StandardFunctionBodyBlock:
</span><del>- context.setEndOffset(info.body, m_lexer->currentOffset());
</del><ins>+ context.setEndOffset(functionInfo.body, m_lexer->currentOffset());
</ins><span class="cx"> next();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#else
- context.setEndOffset(info.body, m_lexer->currentOffset());
- next();
-#endif
- info.bodyEndLine = m_lastTokenEndPosition.line;
</del><ins>+ functionInfo.endLine = m_lastTokenEndPosition.line;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_lastFunctionName = lastFunctionName;
</span><span class="cx"> ParserState oldState = saveState();
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- switch (info.functionBodyType) {
- case ArrowFunctionBodyBlock: {
- // Consume => in case of arrow function block e.g. x => { return x; }
- next();
</del><ins>+ functionInfo.body = parseFunctionBody(context, startLocation, startColumn, functionKeywordStart, functionNameStart, parametersStart, constructorKind, functionBodyType, functionInfo.parameterCount, mode);
</ins><span class="cx">
</span><del>- info.bodyStartLine = tokenLine();
- info.bodyStartColumn = m_token.m_data.offset - m_token.m_data.lineStartOffset;
-
- info.body = parseFunctionBody(context, functionKeywordStart, functionNameStart, parametersStart, constructorKind, StandardFunctionParseType);
- break;
- }
- case StandardFunctionBodyBlock:
- case ArrowFunctionBodyExpression : {
- info.body = parseFunctionBody(context, functionKeywordStart, functionNameStart, parametersStart, constructorKind, parseType);
- break;
- }
- }
-#else
- info.body = parseFunctionBody(context, functionKeywordStart, functionNameStart, parametersStart, constructorKind, StandardFunctionParseType);
-#endif
-
</del><span class="cx"> restoreState(oldState);
</span><del>- failIfFalse(info.body, "Cannot parse the body of this ", stringForFunctionMode(mode));
- context.setEndOffset(info.body, m_lexer->currentOffset());
- if (functionScope->strictMode() && info.name) {
- RELEASE_ASSERT(mode == FunctionMode || mode == MethodMode);
- semanticFailIfTrue(m_vm->propertyNames->arguments == *info.name, "'", info.name->impl(), "' is not a valid function name in strict mode");
- semanticFailIfTrue(m_vm->propertyNames->eval == *info.name, "'", info.name->impl(), "' is not a valid function name in strict mode");
</del><ins>+ failIfFalse(functionInfo.body, "Cannot parse the body of this ", stringForFunctionMode(mode));
+ context.setEndOffset(functionInfo.body, m_lexer->currentOffset());
+ if (functionScope->strictMode() && functionInfo.name) {
+ RELEASE_ASSERT(mode == NormalFunctionMode || mode == MethodMode);
+ semanticFailIfTrue(m_vm->propertyNames->arguments == *functionInfo.name, "'", functionInfo.name->impl(), "' is not a valid function name in strict mode");
+ semanticFailIfTrue(m_vm->propertyNames->eval == *functionInfo.name, "'", functionInfo.name->impl(), "' is not a valid function name in strict mode");
</ins><span class="cx"> }
</span><span class="cx"> if (functionScope->hasDirectSuper()) {
</span><span class="cx"> semanticFailIfTrue(!isClassConstructor, "Cannot call super() outside of a class constructor");
</span><span class="lines">@@ -1760,56 +1740,48 @@
</span><span class="cx"> semanticFailIfTrue(expectedSuperBinding == SuperBinding::NotNeeded, "super can only be used in a method of a derived class");
</span><span class="cx">
</span><span class="cx"> JSTokenLocation location = JSTokenLocation(m_token.m_location);
</span><del>- info.endFunctionOffset = m_token.m_data.offset;
</del><ins>+ functionInfo.endOffset = m_token.m_data.offset;
</ins><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- if (info.functionBodyType == ArrowFunctionBodyExpression) {
</del><ins>+ if (functionBodyType == ArrowFunctionBodyExpression) {
</ins><span class="cx"> location = locationBeforeLastToken();
</span><del>- info.endFunctionOffset = location.endOffset;
</del><ins>+ functionInfo.endOffset = location.endOffset;
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><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"> static const int minimumFunctionLengthToCache = 16;
</span><span class="cx"> std::unique_ptr<SourceProviderCacheItem> newInfo;
</span><del>- int functionLength = info.endFunctionOffset - info.startFunctionOffset;
</del><ins>+ int functionLength = functionInfo.endOffset - functionInfo.startOffset;
</ins><span class="cx"> if (TreeBuilder::CanUseFunctionCache && m_functionCache && functionLength > minimumFunctionLengthToCache) {
</span><span class="cx"> SourceProviderCacheItemCreationParameters parameters;
</span><del>- parameters.endFunctionOffset = info.endFunctionOffset;
</del><ins>+ parameters.endFunctionOffset = functionInfo.endOffset;
</ins><span class="cx"> parameters.functionNameStart = functionNameStart;
</span><span class="cx"> parameters.lastTockenLine = location.line;
</span><span class="cx"> parameters.lastTockenStartOffset = location.startOffset;
</span><span class="cx"> parameters.lastTockenEndOffset = location.endOffset;
</span><span class="cx"> parameters.lastTockenLineStartOffset = location.lineStartOffset;
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- if (info.functionBodyType == ArrowFunctionBodyExpression) {
</del><ins>+ parameters.parameterCount = functionInfo.parameterCount;
+ if (functionBodyType == ArrowFunctionBodyExpression) {
</ins><span class="cx"> parameters.isBodyArrowExpression = true;
</span><span class="cx"> parameters.tokenType = m_token.m_type;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> functionScope->fillParametersForSourceProviderCache(parameters);
</span><span class="cx"> newInfo = SourceProviderCacheItem::create(parameters);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo);
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- if (info.functionBodyType == ArrowFunctionBodyExpression)
</del><ins>+ if (functionBodyType == ArrowFunctionBodyExpression)
</ins><span class="cx"> failIfFalse(isEndOfArrowFunction(), "Expected the closing ';' ',' ']' ')' '}', line terminator or EOF after arrow function");
</span><span class="cx"> else {
</span><span class="cx"> matchOrFail(CLOSEBRACE, "Expected a closing '}' after a ", stringForFunctionMode(mode), " body");
</span><span class="cx"> next();
</span><span class="cx"> }
</span><del>-#else
- matchOrFail(CLOSEBRACE, "Expected a closing '}' after a ", stringForFunctionMode(mode), " body");
- next();
-#endif
</del><span class="cx">
</span><span class="cx"> if (newInfo)
</span><del>- m_functionCache->add(info.startFunctionOffset, WTF::move(newInfo));
</del><ins>+ m_functionCache->add(functionInfo.startOffset, WTF::move(newInfo));
</ins><span class="cx">
</span><del>- info.bodyEndLine = m_lastTokenEndPosition.line;
</del><ins>+ functionInfo.endLine = m_lastTokenEndPosition.line;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1820,12 +1792,12 @@
</span><span class="cx"> JSTokenLocation location(tokenLocation());
</span><span class="cx"> unsigned functionKeywordStart = tokenStart();
</span><span class="cx"> next();
</span><del>- ParserFunctionInfo<TreeBuilder> info;
- failIfFalse((parseFunctionInfo(context, FunctionNeedsName, FunctionMode, true, ConstructorKind::None, SuperBinding::NotNeeded,
- functionKeywordStart, info, StandardFunctionParseType)), "Cannot parse this function");
- failIfFalse(info.name, "Function statements must have a name");
- failIfFalseIfStrict(declareVariable(info.name), "Cannot declare a function named '", info.name->impl(), "' in strict mode");
- return context.createFuncDeclStatement(location, info);
</del><ins>+ ParserFunctionInfo<TreeBuilder> functionInfo;
+ failIfFalse((parseFunctionInfo(context, FunctionNeedsName, NormalFunctionMode, true, ConstructorKind::None, SuperBinding::NotNeeded,
+ functionKeywordStart, functionInfo, StandardFunctionParseType)), "Cannot parse this function");
+ failIfFalse(functionInfo.name, "Function statements must have a name");
+ failIfFalseIfStrict(declareVariable(functionInfo.name), "Cannot declare a function named '", functionInfo.name->impl(), "' in strict mode");
+ return context.createFuncDeclStatement(location, functionInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ES6_CLASS_SYNTAX)
</span><span class="lines">@@ -1939,7 +1911,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> ParserFunctionInfo<TreeBuilder> methodInfo;
</span><span class="cx"> bool isConstructor = !isStaticMethod && *ident == propertyNames.constructor;
</span><del>- failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, isStaticMethod ? FunctionMode : MethodMode, false, isConstructor ? constructorKind : ConstructorKind::None, SuperBinding::Needed, methodStart, methodInfo, StandardFunctionParseType)), "Cannot parse this method");
</del><ins>+ failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, isStaticMethod ? NormalFunctionMode : MethodMode, false, isConstructor ? constructorKind : ConstructorKind::None, SuperBinding::Needed, methodStart, methodInfo, StandardFunctionParseType)), "Cannot parse this method");
</ins><span class="cx"> failIfFalse(ident && declareVariable(ident), "Cannot declare a method named '", methodInfo.name->impl(), "'");
</span><span class="cx"> methodInfo.name = isConstructor ? className : ident;
</span><span class="cx">
</span><span class="lines">@@ -2757,7 +2729,7 @@
</span><span class="cx"> next();
</span><span class="cx"> ParserFunctionInfo<TreeBuilder> info;
</span><span class="cx"> info.name = &m_vm->propertyNames->nullIdentifier;
</span><del>- failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, FunctionMode, false, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, info, StandardFunctionParseType)), "Cannot parse function expression");
</del><ins>+ failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, NormalFunctionMode, false, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, info, StandardFunctionParseType)), "Cannot parse function expression");
</ins><span class="cx"> return context.createFunctionExpr(location, info);
</span><span class="cx"> }
</span><span class="cx"> #if ENABLE(ES6_CLASS_SYNTAX)
</span><span class="lines">@@ -3002,7 +2974,6 @@
</span><span class="cx"> return base;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> template <typename LexerType>
</span><span class="cx"> template <class TreeBuilder> TreeExpression Parser<LexerType>::parseArrowFunctionExpression(TreeBuilder& context)
</span><span class="cx"> {
</span><span class="lines">@@ -3012,11 +2983,10 @@
</span><span class="cx"> location = tokenLocation();
</span><span class="cx"> ParserFunctionInfo<TreeBuilder> info;
</span><span class="cx"> info.name = &m_vm->propertyNames->nullIdentifier;
</span><del>- failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, FunctionMode, true, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, info, ArrowFunctionParseType)), "Cannot parse arrow function expression");
</del><ins>+ failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, ArrowFunctionMode, true, ConstructorKind::None, SuperBinding::NotNeeded, functionKeywordStart, info, ArrowFunctionParseType)), "Cannot parse arrow function expression");
</ins><span class="cx">
</span><span class="cx"> return context.createArrowFunctionExpr(location, info);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static const char* operatorString(bool prefix, unsigned tok)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -81,21 +81,9 @@
</span><span class="cx"> COMPILE_ASSERT(LastUntaggedToken < 64, LessThan64UntaggedTokens);
</span><span class="cx">
</span><span class="cx"> enum SourceElementsMode { CheckForStrictMode, DontCheckForStrictMode };
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> enum FunctionParseType { StandardFunctionParseType, ArrowFunctionParseType };
</span><del>-#else
-enum FunctionParseType { StandardFunctionParseType};
-#endif
</del><ins>+enum FunctionBodyType { ArrowFunctionBodyExpression, ArrowFunctionBodyBlock, StandardFunctionBodyBlock };
</ins><span class="cx"> enum FunctionRequirements { FunctionNoRequirements, FunctionNeedsName };
</span><del>-enum FunctionParseMode {
- FunctionMode,
- GetterMode,
- SetterMode,
- MethodMode,
-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- ArrowFunctionMode
-#endif
-};
</del><span class="cx"> enum DestructuringKind {
</span><span class="cx"> DestructureToVariables,
</span><span class="cx"> DestructureToLexicalVariables,
</span><span class="lines">@@ -537,13 +525,12 @@
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> Parser(
</span><del>- VM*, const SourceCode&, FunctionParameters*, const Identifier&,
- JSParserBuiltinMode, JSParserStrictMode, JSParserCodeType,
</del><ins>+ VM*, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, JSParserCodeType,
</ins><span class="cx"> ConstructorKind defaultConstructorKind = ConstructorKind::None, ThisTDZMode = ThisTDZMode::CheckIfNeeded);
</span><span class="cx"> ~Parser();
</span><span class="cx">
</span><span class="cx"> template <class ParsedNode>
</span><del>- std::unique_ptr<ParsedNode> parse(ParserError&);
</del><ins>+ std::unique_ptr<ParsedNode> parse(ParserError&, const Identifier&, FunctionParseMode);
</ins><span class="cx">
</span><span class="cx"> JSTextPosition positionBeforeLastNewline() const { return m_lexer->positionBeforeLastNewline(); }
</span><span class="cx"> JSTokenLocation locationBeforeLastToken() const { return m_lexer->lastTokenLocation(); }
</span><span class="lines">@@ -739,7 +726,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Parser();
</span><del>- String parseInner();
</del><ins>+ String parseInner(const Identifier&, FunctionParseMode);
</ins><span class="cx">
</span><span class="cx"> void didFinishParsing(SourceElements*, DeclarationStacks::FunctionStack&, VariableEnvironment&, CodeFeatures, int, const Vector<RefPtr<UniquedStringImpl>>&&);
</span><span class="cx">
</span><span class="lines">@@ -796,7 +783,6 @@
</span><span class="cx"> return m_token.m_type == IDENT && *m_token.m_data.ident == m_vm->propertyNames->of;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> ALWAYS_INLINE bool isEndOfArrowFunction()
</span><span class="cx"> {
</span><span class="cx"> return match(SEMICOLON) || match(COMMA) || match(CLOSEPAREN) || match(CLOSEBRACE) || match(CLOSEBRACKET) || match(EOFTOK) || m_lexer->prevTerminator();
</span><span class="lines">@@ -804,6 +790,7 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool isArrowFunctionParamters()
</span><span class="cx"> {
</span><ins>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</ins><span class="cx"> bool isArrowFunction = false;
</span><span class="cx">
</span><span class="cx"> if (match(EOFTOK))
</span><span class="lines">@@ -834,8 +821,10 @@
</span><span class="cx"> restoreSavePoint(saveArrowFunctionPoint);
</span><span class="cx">
</span><span class="cx"> return isArrowFunction;
</span><del>- }
</del><ins>+#else
+ return false;
</ins><span class="cx"> #endif
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> ALWAYS_INLINE unsigned tokenStart()
</span><span class="cx"> {
</span><span class="lines">@@ -946,7 +935,7 @@
</span><span class="cx"> return match(LET) && !strictMode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template <class TreeBuilder> TreeSourceElements parseSourceElements(TreeBuilder&, SourceElementsMode, FunctionParseType);
</del><ins>+ template <class TreeBuilder> TreeSourceElements parseSourceElements(TreeBuilder&, SourceElementsMode);
</ins><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 class="cx"> #if ENABLE(ES6_CLASS_SYNTAX)
</span><span class="lines">@@ -987,17 +976,13 @@
</span><span class="cx"> template <class TreeBuilder> TreeProperty parseProperty(TreeBuilder&, bool strict);
</span><span class="cx"> template <class TreeBuilder> TreeExpression parsePropertyMethod(TreeBuilder& context, const Identifier* methodName);
</span><span class="cx"> template <class TreeBuilder> TreeProperty parseGetterSetter(TreeBuilder&, bool strict, PropertyNode::Type, unsigned getterOrSetterStartOffset, ConstructorKind = ConstructorKind::None, SuperBinding = SuperBinding::NotNeeded);
</span><del>- template <class TreeBuilder> ALWAYS_INLINE TreeFunctionBody parseFunctionBody(TreeBuilder&, int functionKeywordStart, int functionNameStart, int parametersStart, ConstructorKind, FunctionParseType);
- template <class TreeBuilder> ALWAYS_INLINE TreeFormalParameterList parseFormalParameters(TreeBuilder&);
</del><ins>+ template <class TreeBuilder> ALWAYS_INLINE TreeFunctionBody parseFunctionBody(TreeBuilder&, const JSTokenLocation&, int, int functionKeywordStart, int functionNameStart, int parametersStart, ConstructorKind, FunctionBodyType, unsigned, FunctionParseMode);
+ template <class TreeBuilder> ALWAYS_INLINE bool parseFormalParameters(TreeBuilder&, TreeFormalParameterList, unsigned&);
</ins><span class="cx"> enum VarDeclarationListContext { ForLoopContext, VarDeclarationContext };
</span><span class="cx"> template <class TreeBuilder> TreeExpression parseVariableDeclarationList(TreeBuilder&, int& declarations, TreeDestructuringPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd, VarDeclarationListContext, DeclarationType);
</span><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeConstDeclList parseConstDeclarationList(TreeBuilder&);
</span><del>-
-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- template <class TreeBuilder> TreeStatement parseArrowFunctionSingleExpressionBody(TreeBuilder&, FunctionParseType);
</del><ins>+ template <class TreeBuilder> TreeSourceElements parseArrowFunctionSingleExpressionBodySourceElements(TreeBuilder&);
</ins><span class="cx"> template <class TreeBuilder> TreeExpression parseArrowFunctionExpression(TreeBuilder&);
</span><del>-#endif
-
</del><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeDestructuringPattern createBindingPattern(TreeBuilder&, DestructuringKind, const Identifier&, int depth, JSToken, AssignmentContext);
</span><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeDestructuringPattern parseDestructuringPattern(TreeBuilder&, DestructuringKind, AssignmentContext = AssignmentContext::DeclarationStatement, int depth = 0);
</span><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeDestructuringPattern tryParseDestructuringPatternExpression(TreeBuilder&, AssignmentContext);
</span><span class="lines">@@ -1030,13 +1015,10 @@
</span><span class="cx"> return allowAutomaticSemicolon();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> void setEndOfStatement()
</span><span class="cx"> {
</span><span class="cx"> m_lexer->setTokenPosition(&m_token);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool canRecurse()
</span><span class="cx"> {
</span><span class="lines">@@ -1108,6 +1090,7 @@
</span><span class="cx"> const SourceCode* m_source;
</span><span class="cx"> ParserArena m_parserArena;
</span><span class="cx"> std::unique_ptr<LexerType> m_lexer;
</span><ins>+ FunctionParameters* m_parameters { nullptr };
</ins><span class="cx">
</span><span class="cx"> bool m_hasStackOverflow;
</span><span class="cx"> String m_errorMessage;
</span><span class="lines">@@ -1153,13 +1136,13 @@
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><span class="cx"> template <class ParsedNode>
</span><del>-std::unique_ptr<ParsedNode> Parser<LexerType>::parse(ParserError& error)
</del><ins>+std::unique_ptr<ParsedNode> Parser<LexerType>::parse(ParserError& error, const Identifier& calleeName, FunctionParseMode parseMode)
</ins><span class="cx"> {
</span><span class="cx"> int errLine;
</span><span class="cx"> String errMsg;
</span><span class="cx">
</span><span class="cx"> if (ParsedNode::scopeIsFunction)
</span><del>- m_lexer->setIsReparsing();
</del><ins>+ m_lexer->setIsReparsingFunction();
</ins><span class="cx">
</span><span class="cx"> m_sourceElements = 0;
</span><span class="cx">
</span><span class="lines">@@ -1170,7 +1153,7 @@
</span><span class="cx"> ASSERT(m_source->startColumn() > 0);
</span><span class="cx"> unsigned startColumn = m_source->startColumn() - 1;
</span><span class="cx">
</span><del>- String parseError = parseInner();
</del><ins>+ String parseError = parseInner(calleeName, parseMode);
</ins><span class="cx">
</span><span class="cx"> int lineNumber = m_lexer->lineNumber();
</span><span class="cx"> bool lexError = m_lexer->sawError();
</span><span class="lines">@@ -1200,6 +1183,7 @@
</span><span class="cx"> m_varDeclarations,
</span><span class="cx"> m_funcDeclarations,
</span><span class="cx"> currentScope()->finalizeLexicalEnvironment(),
</span><ins>+ m_parameters,
</ins><span class="cx"> *m_source,
</span><span class="cx"> m_features,
</span><span class="cx"> m_numConstants);
</span><span class="lines">@@ -1233,18 +1217,19 @@
</span><span class="cx">
</span><span class="cx"> template <class ParsedNode>
</span><span class="cx"> std::unique_ptr<ParsedNode> parse(
</span><del>- VM* vm, const SourceCode& source, FunctionParameters* parameters,
</del><ins>+ VM* vm, const SourceCode& source,
</ins><span class="cx"> const Identifier& name, JSParserBuiltinMode builtinMode,
</span><span class="cx"> JSParserStrictMode strictMode, JSParserCodeType codeType,
</span><del>- ParserError& error, JSTextPosition* positionBeforeLastNewline = 0,
- ConstructorKind defaultConstructorKind = ConstructorKind::None, ThisTDZMode thisTDZMode = ThisTDZMode::CheckIfNeeded)
</del><ins>+ ParserError& error, JSTextPosition* positionBeforeLastNewline = nullptr,
+ FunctionParseMode parseMode = NotAFunctionMode, ConstructorKind defaultConstructorKind = ConstructorKind::None,
+ ThisTDZMode thisTDZMode = ThisTDZMode::CheckIfNeeded)
</ins><span class="cx"> {
</span><span class="cx"> SamplingRegion samplingRegion("Parsing");
</span><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, parameters, name, builtinMode, strictMode, codeType, defaultConstructorKind, thisTDZMode);
- std::unique_ptr<ParsedNode> result = parser.parse<ParsedNode>(error);
</del><ins>+ Parser<Lexer<LChar>> parser(vm, source, builtinMode, strictMode, codeType, defaultConstructorKind, thisTDZMode);
+ std::unique_ptr<ParsedNode> result = parser.parse<ParsedNode>(error, name, parseMode);
</ins><span class="cx"> if (positionBeforeLastNewline)
</span><span class="cx"> *positionBeforeLastNewline = parser.positionBeforeLastNewline();
</span><span class="cx"> if (builtinMode == JSParserBuiltinMode::Builtin) {
</span><span class="lines">@@ -1256,8 +1241,8 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx"> ASSERT_WITH_MESSAGE(defaultConstructorKind == ConstructorKind::None, "BuiltinExecutables::createDefaultConstructor should always use a 8-bit string");
</span><del>- Parser<Lexer<UChar>> parser(vm, source, parameters, name, builtinMode, strictMode, codeType, defaultConstructorKind, thisTDZMode);
- std::unique_ptr<ParsedNode> result = parser.parse<ParsedNode>(error);
</del><ins>+ Parser<Lexer<UChar>> parser(vm, source, builtinMode, strictMode, codeType, defaultConstructorKind, thisTDZMode);
+ std::unique_ptr<ParsedNode> result = parser.parse<ParsedNode>(error, name, parseMode);
</ins><span class="cx"> if (positionBeforeLastNewline)
</span><span class="cx"> *positionBeforeLastNewline = parser.positionBeforeLastNewline();
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserFunctionInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ParserFunctionInfo.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserFunctionInfo.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/ParserFunctionInfo.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -28,27 +28,17 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
-enum FunctionBodyType { ArrowFunctionBodyExpression, ArrowFunctionBodyBlock, StandardFunctionBodyBlock };
-#endif
-
</del><span class="cx"> template <class TreeBuilder>
</span><span class="cx"> struct ParserFunctionInfo {
</span><span class="cx"> const Identifier* name = 0;
</span><span class="cx"> typename TreeBuilder::FormalParameterList parameters = 0;
</span><span class="cx"> typename TreeBuilder::FunctionBody body = 0;
</span><del>- unsigned startFunctionOffset = 0;
- unsigned endFunctionOffset = 0;
- int bodyStartLine = 0;
- int bodyEndLine = 0;
</del><ins>+ unsigned parameterCount = 0;
+ unsigned startOffset = 0;
+ unsigned endOffset = 0;
+ int startLine = 0;
+ int endLine = 0;
</ins><span class="cx"> unsigned bodyStartColumn = 0;
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- unsigned arrowFunctionOffset = 0;
- unsigned arrowFunctionNextTockenEndOffset = 0;
- bool isArrowFunction { false };
- bool isEndByTerminator { false };
- FunctionBodyType functionBodyType { StandardFunctionBodyBlock };
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ES6_CLASS_SYNTAX)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserModesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ParserModes.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserModes.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/ParserModes.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -44,6 +44,15 @@
</span><span class="cx">
</span><span class="cx"> enum FunctionMode { FunctionExpression, FunctionDeclaration };
</span><span class="cx">
</span><ins>+enum FunctionParseMode {
+ NormalFunctionMode,
+ GetterMode,
+ SetterMode,
+ MethodMode,
+ NotAFunctionMode,
+ ArrowFunctionMode
+};
+
</ins><span class="cx"> inline bool functionNameIsInScope(const Identifier& name, FunctionMode functionMode)
</span><span class="cx"> {
</span><span class="cx"> if (name.isNull())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceCodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceCode.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceCode.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/SourceCode.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -105,9 +105,6 @@
</span><span class="cx">
</span><span class="cx"> SourceCode subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn);
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- SourceCode subArrowExpression(unsigned startArrowFunction, unsigned endArrowFunction, int firstLine, int startColumn);
-#endif
</del><span class="cx"> private:
</span><span class="cx"> RefPtr<SourceProvider> m_provider;
</span><span class="cx"> int m_startChar;
</span><span class="lines">@@ -121,20 +118,8 @@
</span><span class="cx"> return SourceCode(StringSourceProvider::create(source, url, startPosition), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
- inline SourceCode SourceCode::subArrowExpression(unsigned startArrowFunction, unsigned endArrowFunction, int firstLine, int startColumn)
- {
- ASSERT(provider()->source()[startArrowFunction] == '=' && provider()->source()[startArrowFunction + 1] == '>');
-
- startColumn += 1; // Convert to base 1.
- return SourceCode(provider(), startArrowFunction, endArrowFunction, firstLine, startColumn);
- }
-#endif
-
</del><span class="cx"> inline SourceCode SourceCode::subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn)
</span><span class="cx"> {
</span><del>- ASSERT(provider()->source()[openBrace] == '{');
- ASSERT(provider()->source()[closeBrace] == '}');
</del><span class="cx"> startColumn += 1; // Convert to base 1.
</span><span class="cx"> return SourceCode(provider(), openBrace, closeBrace + 1, firstLine, startColumn);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceProviderCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceProviderCache.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceProviderCache.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/SourceProviderCache.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> const SourceProviderCacheItem* get(int sourcePosition) const { return m_map.get(sourcePosition); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- HashMap<int, std::unique_ptr<SourceProviderCacheItem>> m_map;
</del><ins>+ HashMap<int, std::unique_ptr<SourceProviderCacheItem>, WTF::IntHash<int>, WTF::UnsignedWithZeroKeyHashTraits<int>> m_map;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSourceProviderCacheItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SourceProviderCacheItem.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SourceProviderCacheItem.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/SourceProviderCacheItem.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -40,15 +40,14 @@
</span><span class="cx"> unsigned lastTockenEndOffset;
</span><span class="cx"> unsigned lastTockenLineStartOffset;
</span><span class="cx"> unsigned endFunctionOffset;
</span><ins>+ unsigned parameterCount;
</ins><span class="cx"> bool needsFullActivation;
</span><span class="cx"> bool usesEval;
</span><span class="cx"> bool strictMode;
</span><span class="cx"> Vector<RefPtr<UniquedStringImpl>> usedVariables;
</span><span class="cx"> Vector<RefPtr<UniquedStringImpl>> writtenVariables;
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> bool isBodyArrowExpression { false };
</span><span class="cx"> JSTokenType tokenType { CLOSEBRACE };
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if COMPILER(MSVC)
</span><span class="lines">@@ -65,11 +64,7 @@
</span><span class="cx"> JSToken endFunctionToken() const
</span><span class="cx"> {
</span><span class="cx"> JSToken token;
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> token.m_type = isBodyArrowExpression ? tokenType : CLOSEBRACE;
</span><del>-#else
- token.m_type = CLOSEBRACE;
-#endif
</del><span class="cx"> token.m_data.offset = lastTockenStartOffset;
</span><span class="cx"> token.m_location.startOffset = lastTockenStartOffset;
</span><span class="cx"> token.m_location.endOffset = lastTockenEndOffset;
</span><span class="lines">@@ -87,6 +82,7 @@
</span><span class="cx"> unsigned lastTockenLine : 31;
</span><span class="cx"> unsigned lastTockenStartOffset : 31;
</span><span class="cx"> unsigned lastTockenEndOffset: 31;
</span><ins>+ unsigned parameterCount;
</ins><span class="cx">
</span><span class="cx"> bool usesEval : 1;
</span><span class="cx">
</span><span class="lines">@@ -98,10 +94,8 @@
</span><span class="cx">
</span><span class="cx"> UniquedStringImpl** usedVariables() const { return const_cast<UniquedStringImpl**>(m_variables); }
</span><span class="cx"> UniquedStringImpl** writtenVariables() const { return const_cast<UniquedStringImpl**>(&m_variables[usedVariablesCount]); }
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> bool isBodyArrowExpression;
</span><span class="cx"> JSTokenType tokenType;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SourceProviderCacheItem(const SourceProviderCacheItemCreationParameters&);
</span><span class="lines">@@ -130,15 +124,14 @@
</span><span class="cx"> , lastTockenLine(parameters.lastTockenLine)
</span><span class="cx"> , lastTockenStartOffset(parameters.lastTockenStartOffset)
</span><span class="cx"> , lastTockenEndOffset(parameters.lastTockenEndOffset)
</span><ins>+ , parameterCount(parameters.parameterCount)
</ins><span class="cx"> , usesEval(parameters.usesEval)
</span><span class="cx"> , strictMode(parameters.strictMode)
</span><span class="cx"> , lastTockenLineStartOffset(parameters.lastTockenLineStartOffset)
</span><span class="cx"> , usedVariablesCount(parameters.usedVariables.size())
</span><span class="cx"> , writtenVariablesCount(parameters.writtenVariables.size())
</span><del>-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><span class="cx"> , isBodyArrowExpression(parameters.isBodyArrowExpression)
</span><span class="cx"> , tokenType(parameters.tokenType)
</span><del>-#endif
</del><span class="cx"> {
</span><span class="cx"> unsigned j = 0;
</span><span class="cx"> for (unsigned i = 0; i < usedVariablesCount; ++i, ++j) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SyntaxChecker.h (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typedef SyntaxChecker FunctionBodyBuilder;
</del><span class="cx"> enum { NoneExpr = 0,
</span><span class="cx"> ResolveEvalExpr, ResolveExpr, IntegerExpr, DoubleExpr, StringExpr,
</span><span class="cx"> ThisExpr, NullExpr, BoolExpr, RegExpExpr, ObjectLiteralExpr,
</span><span class="lines">@@ -179,10 +178,8 @@
</span><span class="cx"> ClassExpression createClassExpr(const JSTokenLocation&, const Identifier&, ExpressionType, ExpressionType, PropertyList, PropertyList) { return ClassExpr; }
</span><span class="cx"> #endif
</span><span class="cx"> ExpressionType createFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&) { return FunctionExpr; }
</span><del>- int createFunctionBody(const JSTokenLocation&, const JSTokenLocation&, int, int, bool, int, int, int, ConstructorKind) { return FunctionBodyResult; }
-#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
</del><ins>+ int createFunctionBody(const JSTokenLocation&, const JSTokenLocation&, int, int, bool, int, int, int, ConstructorKind, unsigned, int) { return FunctionBodyResult; }
</ins><span class="cx"> ExpressionType createArrowFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&) { return FunctionExpr; }
</span><del>-#endif
</del><span class="cx"> void setFunctionNameStart(int, int) { }
</span><span class="cx"> int createArguments() { return ArgumentsResult; }
</span><span class="cx"> int createArguments(int) { return ArgumentsResult; }
</span><span class="lines">@@ -221,8 +218,8 @@
</span><span class="cx"> int createPropertyList(const JSTokenLocation&, Property, int) { return PropertyListResult; }
</span><span class="cx"> int createElementList(int, int) { return ElementsListResult; }
</span><span class="cx"> int createElementList(int, int, int) { return ElementsListResult; }
</span><del>- int createFormalParameterList(DestructuringPattern) { return FormalParameterListResult; }
- int createFormalParameterList(int, DestructuringPattern) { return FormalParameterListResult; }
</del><ins>+ int createFormalParameterList() { return FormalParameterListResult; }
+ void appendParameter(int, DestructuringPattern) { }
</ins><span class="cx"> int createClause(int, int) { return ClauseResult; }
</span><span class="cx"> int createClauseList(int) { return ClauseListResult; }
</span><span class="cx"> int createClauseList(int, int) { return ClauseListResult; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -94,8 +94,8 @@
</span><span class="cx">
</span><span class="cx"> typedef typename CacheTypes<UnlinkedCodeBlockType>::RootNode RootNode;
</span><span class="cx"> std::unique_ptr<RootNode> rootNode = parse<RootNode>(
</span><del>- &vm, source, 0, Identifier(), builtinMode, strictMode,
- JSParserCodeType::Program, error, 0, ConstructorKind::None, thisTDZMode);
</del><ins>+ &vm, source, Identifier(), builtinMode, strictMode,
+ JSParserCodeType::Program, error, nullptr, FunctionParseMode::NotAFunctionMode, ConstructorKind::None, thisTDZMode);
</ins><span class="cx"> if (!rootNode)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> JSTextPosition positionBeforeLastNewline;
</span><span class="cx"> std::unique_ptr<ProgramNode> program = parse<ProgramNode>(
</span><del>- &vm, source, 0, Identifier(), JSParserBuiltinMode::NotBuiltin,
</del><ins>+ &vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin,
</ins><span class="cx"> JSParserStrictMode::NotStrict, JSParserCodeType::Program,
</span><span class="cx"> error, &positionBeforeLastNewline);
</span><span class="cx"> if (!program) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCompletioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Completion.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Completion.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/runtime/Completion.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> JSLockHolder lock(vm);
</span><span class="cx"> RELEASE_ASSERT(vm.atomicStringTable() == wtfThreadData().atomicStringTable());
</span><span class="cx"> return !!parse<ProgramNode>(
</span><del>- &vm, source, 0, Identifier(), JSParserBuiltinMode::NotBuiltin,
</del><ins>+ &vm, source, Identifier(), JSParserBuiltinMode::NotBuiltin,
</ins><span class="cx"> JSParserStrictMode::NotStrict, JSParserCodeType::Program, error);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.cpp (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> JSGlobalObject* lexicalGlobalObject = exec->lexicalGlobalObject();
</span><span class="cx"> std::unique_ptr<ProgramNode> programNode = parse<ProgramNode>(
</span><del>- vm, m_source, 0, Identifier(), JSParserBuiltinMode::NotBuiltin,
</del><ins>+ vm, m_source, Identifier(), JSParserBuiltinMode::NotBuiltin,
</ins><span class="cx"> JSParserStrictMode::NotStrict, JSParserCodeType::Program, error);
</span><span class="cx"> if (programNode)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestscontrolFlowProfilerconditionalexpressionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/controlFlowProfiler/conditional-expression.js (186958 => 186959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/controlFlowProfiler/conditional-expression.js 2015-07-17 18:46:13 UTC (rev 186958)
+++ trunk/Source/JavaScriptCore/tests/controlFlowProfiler/conditional-expression.js 2015-07-17 18:48:30 UTC (rev 186959)
</span><span class="lines">@@ -24,17 +24,17 @@
</span><span class="cx"> : bar()
</span><span class="cx"> }
</span><span class="cx"> testConditionalFunctionCall(false, false);
</span><del>-checkBasicBlock(testConditionalFunctionCall, "x", ShouldHaveExecuted);
</del><ins>+checkBasicBlock(testConditionalFunctionCall, "x ?", ShouldHaveExecuted);
</ins><span class="cx"> checkBasicBlock(testConditionalFunctionCall, "? y", ShouldHaveExecuted);
</span><span class="cx"> checkBasicBlock(testConditionalFunctionCall, "bar", ShouldHaveExecuted);
</span><span class="cx"> checkBasicBlock(testConditionalFunctionCall, ": bar", ShouldHaveExecuted);
</span><del>-checkBasicBlock(testConditionalFunctionCall, "y", ShouldNotHaveExecuted);
</del><ins>+checkBasicBlock(testConditionalFunctionCall, "y ?", ShouldNotHaveExecuted);
</ins><span class="cx"> checkBasicBlock(testConditionalFunctionCall, "? foo", ShouldNotHaveExecuted);
</span><span class="cx"> checkBasicBlock(testConditionalFunctionCall, "foo", ShouldNotHaveExecuted);
</span><span class="cx"> checkBasicBlock(testConditionalFunctionCall, "baz", ShouldNotHaveExecuted);
</span><span class="cx">
</span><span class="cx"> testConditionalFunctionCall(true, false);
</span><del>-checkBasicBlock(testConditionalFunctionCall, "y", ShouldHaveExecuted);
</del><ins>+checkBasicBlock(testConditionalFunctionCall, "y ?", ShouldHaveExecuted);
</ins><span class="cx"> checkBasicBlock(testConditionalFunctionCall, "? foo", ShouldHaveExecuted);
</span><span class="cx"> checkBasicBlock(testConditionalFunctionCall, ": baz", ShouldHaveExecuted);
</span><span class="cx"> checkBasicBlock(testConditionalFunctionCall, "baz", ShouldHaveExecuted);
</span></span></pre>
</div>
</div>
</body>
</html>