AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[strong] make function and class declarations lexical & immutable

Browse Source 
R=arv@chromium.org
BUG=

Review URL: https://codereview.chromium.org/932283003

Cr-Commit-Position: refs/heads/master@{#26755}
This commit is contained in:
rossberg 2015-02-19 08:49:11 -08:00 committed by Commit bot
parent 0cffc08b66
commit 7b49ed658c
4 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ast.h
View File

@ -577,8 +577,7 @@ class FunctionDeclaration FINAL : public Declaration {
int pos)
: Declaration(zone, proxy, mode, scope, pos),
fun_(fun) {
// At the moment there are no "const functions" in JavaScript...
DCHECK(mode == VAR || mode == LET);
DCHECK(mode == VAR || mode == LET || mode == CONST);
DCHECK(fun != NULL);
}

9
src/parser.cc
View File

@ -1975,6 +1975,7 @@ Statement* Parser::ParseFunctionDeclaration(
// In ES6, a function behaves as a lexical binding, except in
// a script scope, or the initial scope of eval or another function.
VariableMode mode =
is_strong(language_mode()) ? CONST :
allow_harmony_scoping() && is_strict(language_mode()) &&
!(scope_->is_script_scope() || scope_->is_eval_scope() ||
scope_->is_function_scope())
@ -2018,13 +2019,15 @@ Statement* Parser::ParseClassDeclaration(ZoneList<const AstRawString*>* names,
ClassLiteral* value = ParseClassLiteral(name, scanner()->location(),
is_strict_reserved, pos, CHECK_OK);
VariableProxy* proxy = NewUnresolved(name, LET);
VariableMode mode = is_strong(language_mode()) ? CONST : LET;
VariableProxy* proxy = NewUnresolved(name, mode);
Declaration* declaration =
factory()->NewVariableDeclaration(proxy, LET, scope_, pos);
factory()->NewVariableDeclaration(proxy, mode, scope_, pos);
Declare(declaration, true, CHECK_OK);
proxy->var()->set_initializer_position(pos);
Token::Value init_op = Token::INIT_LET;
Token::Value init_op =
is_strong(language_mode()) ? Token::INIT_CONST : Token::INIT_LET;
Assignment* assignment = factory()->NewAssignment(init_op, proxy, value, pos);
Statement* assignment_statement =
factory()->NewExpressionStatement(assignment, RelocInfo::kNoPosition);

17
test/mjsunit/strong/classes.js Normal file
View File

@ -0,0 +1,17 @@
// Copyright 2015 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Flags: --strong-mode
'use strong';
class C {}
(function ImmutableClassBindings() {
class D {}
assertThrows(function(){ eval("C = 0") }, TypeError);
assertThrows(function(){ eval("D = 0") }, TypeError);
assertEquals('function', typeof C);
assertEquals('function', typeof D);
})();

17
test/mjsunit/strong/arguments.js → test/mjsunit/strong/functions.js
View File

@ -4,6 +4,8 @@
// Flags: --strong-mode
'use strong';
(function NoArguments() {
assertThrows("'use strong'; arguments", SyntaxError);
assertThrows("'use strong'; function f() { arguments }", SyntaxError);
@ -14,3 +16,18 @@
assertThrows("'use strong'; function f(arguments) {}", SyntaxError);
assertThrows("'use strong'; let f = (arguments) => {}", SyntaxError);
})();
function g() {}
(function LexicalFunctionBindings(global) {
assertEquals('function', typeof g);
assertEquals(undefined, global.g);
})(this);
(function ImmutableFunctionBindings() {
function f() {}
assertThrows(function(){ eval("g = 0") }, TypeError);
assertThrows(function(){ eval("f = 0") }, TypeError);
assertEquals('function', typeof g);
assertEquals('function', typeof f);
})();