85c2c8d847
Reason for revert: This is going to break the LayoutTest inspector-protocol/console/console-let-const-with-api.html as seen in https://build.chromium.org/p/tryserver.v8/builders/v8_linux_blink_rel/builds/2247 . Please run this test manually, using instructions at https://www.chromium.org/developers/testing/webkit-layout-tests , and fix on the Chrome side if needed before resubmitting this patch. Original issue's description: > change most cases of variable redeclaration from TypeError to SyntaxError. > > Code like `let a; eval("var a;");` should throw a SyntaxError, not a TypeError > (this caused a test262 failure.). However, the code `eval("function NaN() {}");` > should actually throw a TypeError. This patch changes most cases of > redeclaration errors from TypeError to SyntaxError. See the test > mjsunit/regress/redeclaration-error-types for a thorough analysis with spec > references. > > The relevant sections of the spec are ES#sec-globaldeclarationinstantiation and > ES#sec-evaldeclarationinstantiation > > BUG=v8:4955 > LOG=y > > Committed: https://crrev.com/2b787561763d0f7e8dab698652715a742cf78291 > Cr-Commit-Position: refs/heads/master@{#36940} TBR=adamk@chromium.org,jwolfe@igalia.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=v8:4955 Review-Url: https://codereview.chromium.org/2064793002 Cr-Commit-Position: refs/heads/master@{#36941}
142 lines
2.5 KiB
JavaScript
142 lines
2.5 KiB
JavaScript
// 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.
|
|
|
|
// Var-let conflict in a function throws, even if the var is in an eval
|
|
|
|
// Throws at the top level of a function
|
|
assertThrows(function() {
|
|
let x = 1;
|
|
eval('var x');
|
|
}, TypeError);
|
|
|
|
// If the eval is in its own block scope, throws
|
|
assertThrows(function() {
|
|
let y = 1;
|
|
{ eval('var y'); }
|
|
}, TypeError);
|
|
|
|
// If the let is in its own block scope, with the eval, throws
|
|
assertThrows(function() {
|
|
{
|
|
let x = 1;
|
|
eval('var x');
|
|
}
|
|
}, TypeError);
|
|
|
|
// Legal if the let is no longer visible
|
|
assertDoesNotThrow(function() {
|
|
{
|
|
let x = 1;
|
|
}
|
|
eval('var x');
|
|
});
|
|
|
|
// All the same works for const:
|
|
// Throws at the top level of a function
|
|
assertThrows(function() {
|
|
const x = 1;
|
|
eval('var x');
|
|
}, TypeError);
|
|
|
|
// If the eval is in its own block scope, throws
|
|
assertThrows(function() {
|
|
const y = 1;
|
|
{ eval('var y'); }
|
|
}, TypeError);
|
|
|
|
// If the const is in its own block scope, with the eval, throws
|
|
assertThrows(function() {
|
|
{
|
|
const x = 1;
|
|
eval('var x');
|
|
}
|
|
}, TypeError);
|
|
|
|
// Legal if the const is no longer visible
|
|
assertDoesNotThrow(function() {
|
|
{
|
|
const x = 1;
|
|
}
|
|
eval('var x');
|
|
});
|
|
|
|
// In global scope
|
|
let caught = false;
|
|
try {
|
|
let z = 1;
|
|
eval('var z');
|
|
} catch (e) {
|
|
caught = true;
|
|
}
|
|
assertTrue(caught);
|
|
|
|
// Let declarations beyond a function boundary don't conflict
|
|
caught = false;
|
|
try {
|
|
let a = 1;
|
|
(function() {
|
|
eval('var a');
|
|
})();
|
|
} catch (e) {
|
|
caught = true;
|
|
}
|
|
assertFalse(caught);
|
|
|
|
// var across with doesn't conflict
|
|
caught = false;
|
|
try {
|
|
(function() {
|
|
with ({x: 1}) {
|
|
eval("var x");
|
|
}
|
|
})();
|
|
} catch (e) {
|
|
caught = true;
|
|
}
|
|
assertFalse(caught);
|
|
|
|
// var can still conflict with let across a with
|
|
caught = false;
|
|
try {
|
|
(function() {
|
|
let x;
|
|
with ({x: 1}) {
|
|
eval("var x");
|
|
}
|
|
})();
|
|
} catch (e) {
|
|
caught = true;
|
|
}
|
|
assertTrue(caught);
|
|
|
|
// Functions declared in eval also conflict
|
|
caught = false
|
|
try {
|
|
(function() {
|
|
{
|
|
let x = 1;
|
|
eval('function x() {}');
|
|
}
|
|
})();
|
|
} catch (e) {
|
|
caught = true;
|
|
}
|
|
assertTrue(caught);
|
|
|
|
// TODO(littledan): Hoisting x out of the block should be
|
|
// prevented in this case BUG(v8:4479)
|
|
caught = false
|
|
try {
|
|
(function() {
|
|
{
|
|
let x = 1;
|
|
eval('{ function x() {} }');
|
|
}
|
|
})();
|
|
} catch (e) {
|
|
caught = true;
|
|
}
|
|
// TODO(littledan): switch to assertTrue when bug is fixed
|
|
assertTrue(caught);
|