source: webkit/trunk/JavaScriptCore/parser/Parser.cpp@ 67769

Last change on this file since 67769 was 67769, checked in by [email protected], 15 years ago

2010-09-17 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

Imprecise tracking of variable capture leads to overly pessimistic creation of activations
​https://bugs.webkit.org/show_bug.cgi?id=46020

The old logic for track free and captured variables would cause us
to decide we needed an activation in every function along the scope
chain between a variable capture and its declaration. We now track
captured variables precisely which requires a bit of additional work

The most substantial change is that the parsing routine needs to
be passed the list of function parameters when reparsing a function
as when reparsing we don't parse the function declaration itself only
its body.

  • JavaScriptCore.exp:
  • parser/JSParser.cpp: (JSC::JSParser::Scope::Scope): (JSC::JSParser::Scope::needsFullActivation):

We need to distinguish between use of a feature that requires
an activation and eval so we now get this additional flag.

(JSC::JSParser::Scope::collectFreeVariables):
(JSC::JSParser::Scope::getCapturedVariables):

We can't simply return the list of "capturedVariables" now as
is insufficiently precise, so we compute them instead.

(JSC::JSParser::popScope):
(JSC::jsParse):
(JSC::JSParser::JSParser):
(JSC::JSParser::parseProgram):
(JSC::JSParser::parseWithStatement):
(JSC::JSParser::parseTryStatement):
(JSC::JSParser::parseFunctionInfo):
(JSC::JSParser::parseFunctionDeclaration):
(JSC::JSParser::parseProperty):
(JSC::JSParser::parseMemberExpression):

  • parser/JSParser.h:
  • parser/Parser.cpp: (JSC::Parser::parse):
  • parser/Parser.h: (JSC::Parser::parse):
  • runtime/Executable.cpp: (JSC::EvalExecutable::compileInternal): (JSC::ProgramExecutable::checkSyntax): (JSC::ProgramExecutable::compileInternal): (JSC::FunctionExecutable::compileForCallInternal): (JSC::FunctionExecutable::compileForConstructInternal): (JSC::FunctionExecutable::reparseExceptionInfo): (JSC::EvalExecutable::reparseExceptionInfo): (JSC::FunctionExecutable::fromGlobalCode):

Pass function parameters (if available) to the parser.
  • Property svn:eol-style set to native
File size: 2.4 KB
Line 
1/*
2 * Copyright (C) 1999-2001 Harri Porten ([email protected])
3 * Copyright (C) 2001 Peter Kelly ([email protected])
4 * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 *
6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version.
10 *
11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details.
15 *
16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA.
20 *
21 */
22
23#include "config.h"
24#include "Parser.h"
25
26#include "Debugger.h"
27#include "JSParser.h"
28#include "Lexer.h"
29#include <wtf/HashSet.h>
30#include <wtf/Vector.h>
31
32#ifndef yyparse
33extern int jscyyparse(void*);
34#endif
35
36namespace JSC {
37
38void Parser::parse(JSGlobalData* globalData, FunctionParameters* parameters, int* errLine, UString* errMsg)
39{
40 m_sourceElements = 0;
41
42 int defaultErrLine;
43 UString defaultErrMsg;
44
45 if (!errLine)
46 errLine = &defaultErrLine;
47 if (!errMsg)
48 errMsg = &defaultErrMsg;
49
50 *errLine = -1;
51 *errMsg = UString();
52
53 Lexer& lexer = *globalData->lexer;
54 lexer.setCode(*m_source, m_arena);
55
56 int parseError = jsParse(globalData, parameters, m_source);
57 int lineNumber = lexer.lineNumber();
58 bool lexError = lexer.sawError();
59 lexer.clear();
60
61 if (parseError || lexError) {
62 *errLine = lineNumber;
63 *errMsg = "Parse error";
64 m_sourceElements = 0;
65 }
66}
67
68void Parser::didFinishParsing(SourceElements* sourceElements, ParserArenaData<DeclarationStacks::VarStack>* varStack,
69 ParserArenaData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int lastLine, int numConstants, IdentifierSet& capturedVars)
70{
71 m_sourceElements = sourceElements;
72 m_varDeclarations = varStack;
73 m_funcDeclarations = funcStack;
74 m_capturedVariables.swap(capturedVars);
75 m_features = features;
76 m_lastLine = lastLine;
77 m_numConstants = numConstants;
78}
79
80} // namespace JSC
Note: See TracBrowser for help on using the repository browser.