Reland of Ship ES2015 sloppy-mode function hoisting, let, class

test/mjsunit/harmony/destructuring.js

 // 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: --harmony-destructuring-bind
 // Flags: --harmony-default-parameters
 
 (function TestObjectLiteralPattern() {
   var { x : x, y : y, get, set } = { x : 1, y : 2, get: 3, set: 4 };
   assertEquals(1, x);
@@ skipping 973 matching lines @@
   assertEquals(2, f10({x: 6}, 2));
   function f11({x}, y) { var z = y; var y = 2; return z; }
   assertEquals(1, f11({x: 6}, 1));
   function f12(y, g = () => y) { var y = 2; return g(); }
   assertEquals(1, f12(1));
   function f13({x}, y, [z], v) { var x, y, z; return x*y*z*v }
   assertEquals(210, f13({x: 2}, 3, [5], 7));
 
   function f20({x}) { function x() { return 2 }; return x(); }
   assertEquals(2, f20({x: 1}));
+  // Function hoisting is blocked by the conflicting x declaration
   function f21({x}) { { function x() { return 2 } } return x(); }
-  assertEquals(2, f21({x: 1}));
+  assertThrows(() => f21({x: 1}), TypeError);
 
   var g1 = ({x}) => { var x = 2; return x };
   assertEquals(2, g1({x: 1}));
   var g2 = ({x}) => { { var x = 2; } return x; };
   assertEquals(2, g2({x: 1}));
   var g3 = ({x}) => { var y = x; var x = 2; return y; };
   assertEquals(1, g3({x: 1}));
   var g4 = ({x}) => { { var y = x; var x = 2; } return y; };
   assertEquals(1, g4({x: 1}));
   var g5 = ({x}, g = () => x) => { var x = 2; return g(); };
@@ skipping 12 matching lines @@
   var g11 = ({x}, y) => { var z = y; var y = 2; return z; };
   assertEquals(1, g11({x: 6}, 1));
   var g12 = (y, g = () => y) => { var y = 2; return g(); };
   assertEquals(1, g12(1));
   var g13 = ({x}, y, [z], v) => { var x, y, z; return x*y*z*v };
   assertEquals(210, g13({x: 2}, 3, [5], 7));
 
   var g20 = ({x}) => { function x() { return 2 }; return x(); }
   assertEquals(2, g20({x: 1}));
   var g21 = ({x}) => { { function x() { return 2 } } return x(); }
-  assertEquals(2, g21({x: 1}));
+  assertThrows(() => g21({x: 1}), TypeError);
 
   assertThrows("'use strict'; function f(x) { let x = 0; }; f({});", SyntaxError);
   assertThrows("'use strict'; function f({x}) { let x = 0; }; f({});", SyntaxError);
   assertThrows("'use strict'; function f(x) { const x = 0; }; f({});", SyntaxError);
   assertThrows("'use strict'; function f({x}) { const x = 0; }; f({});", SyntaxError);
 
   assertThrows("'use strict'; let g = (x) => { let x = 0; }; f({});", SyntaxError);
   assertThrows("'use strict'; let g = ({x}) => { let x = 0; }; f({});", SyntaxError);
   assertThrows("'use strict'; let g = (x) => { const x = 0; }; f({});", SyntaxError);
   assertThrows("'use strict'; let g = ({x}) => { const x = 0; }; f({});", SyntaxError);
@@ skipping 85 matching lines @@
     throw [1, 2, 3];
   } catch ([foo, ...bar]) {
     assertEquals(1, foo);
     assertEquals([2, 3], bar);
   }
 
   assertEquals("hello", foo);
   assertEquals("world", bar);
   assertEquals(42, baz);
 })();