[strong] Fix scoping related errors for methods.

test/mjsunit/strong/declaration-after-use.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: --strong-mode --harmony_rest_parameters --harmony_arrow_functions --harmony_classes --harmony-computed-property-names
 
 // Note that it's essential for these tests that the reference is inside dead
 // code (because we already produce ReferenceErrors for run-time unresolved
 // variables and don't want to confuse those with strong mode errors). But the
 // errors should *not* be inside lazy, unexecuted functions, since lazy parsing
@@ skipping 92 matching lines @@
 
   assertThrowsHelper(
       "'use strong'; if (false) { let C = class C2 { method() { C; } } }",
       ReferenceError);
 
   assertThrowsHelper(
       "'use strong'; if (false) { let C = class C2 { " +
           "static a() { return 'A'; } [C.a()]() { return 'B'; } }; }",
       ReferenceError);
 
-  // TODO(marja, rossberg): More tests related to computed property names in
-  // classes + recognize more errors. This one is not recognized as an error
-  // yet:
-  // let C = class C2 {
-  //  static a() { return 'A'; }
-  //  [C2.a()]() { return 'B'; } << C2 should not be allowed here
-  // };
+  assertThrowsHelper(
+      "'use strong'; if (false) { let C = class C2 { " +
+          "static a() { return 'A'; } [C2.a()]() { return 'B'; } }; }",
+       ReferenceError);
+
+  assertThrowsHelper(
+      "'use strong'; if (false) { let C = class C2 { " +
+          "[(function() { C; return 'A';})()]() { return 'B'; } }; }",
+      ReferenceError);
+
+  // The reference to C or C2 is inside a function, but not a method.
+  assertThrowsHelper(
+      "'use strong'; if (false) { let C = class C2 { " +
+          "[(function() { C2; return 'A';})()]() { return 'B'; } }; }",
+      ReferenceError);
+
+  assertThrowsHelper(
+      "'use strong'; if (false) { let C = class C2 { " +
+          "[(function() { C; return 'A';})()]() { return 'B'; } }; }",
+      ReferenceError);
+
+  // The reference to C or C2 is inside a method, but it's not a method of the
+  // relevant class (C2).
+  assertThrowsHelper(
+      "'use strong'; if (false) { let C = class C2 { " +
+          "[(new (class D { m() { C2; return 'A'; } })).m()]() " +
+          "{ return 'B'; } } }",
+      ReferenceError);
+
+  assertThrowsHelper(
+      "'use strong'; if (false) { let C = class C2 { " +
+          "[(new (class D { m() { C; return 'A'; } })).m()]() " +
+          "{ return 'B'; } } }",
+      ReferenceError);
+
+  // Methods inside object literals are not sufficiently distinguished from
+  // methods inside classes.
+  // https://code.google.com/p/v8/issues/detail?id=3948
+  // assertThrowsHelper(
+  //     "'use strong'; if (false) { let C = class C2 { " +
+  //         "[({m() { C2; return 'A'; }}).m()]() " +
+  //         "{ return 'B'; } } }",
+  //     ReferenceError);
+
+  assertThrowsHelper(
+      "'use strong'; if (false) { let C = class C2 { " +
+          "[({m() { C; return 'A'; }}).m()]() " +
+          "{ return 'B'; } } }",
+      ReferenceError);
+
+  // assertThrowsHelper(
+  //     "'use strong';\n" +
+  //         "if (false) {\n" +
+  //         "  class COuter {\n" +
+  //         "    m() {\n" +
+  //         "      class CInner {\n" +
+  //         "        [({ m() { CInner; return 'A'; } }).m()]() { return 'B'; }\n" +

[Dmitry Lomov (no reviews), 2015/03/07 18:17:10]

line length

[marja, 2015/03/09 10:01:38]

Done.

+  //         "      }\n" +
+  //         "    }\n" +
+  //         "  }\n" +
+  //         "}",
+  //     ReferenceError);
 })();
 
 
 (function UsesWhichAreFine() {
   "use strong";
 
   let var1 = 0;
   var1;
 
   let var2a = 0, var2b = var2a + 1, var2c = 2 + var2b;
@@ skipping 43 matching lines @@
     var1, var2a, var2b, var2c;
   }
 
   (function eval1() {
     let var7 = 0; // Declaration position will be something large.
     // But use position will be something small, however, this is not an error,
     // since the use is inside an eval scope.
     eval("var7;");
   })();
 
-  // https://code.google.com/p/v8/issues/detail?id=3927
-  // class C1 { constructor() { C1; } }; new C1();
-  // let C2 = class C3 { constructor() { C3; } }; new C2();
 
-  // class C4 { method() { C4; method; } }; new C4();
-  // let C5 = class C6 { method() { C6; method; } }; new C5();
+  class C1 { constructor() { C1; } }; new C1();
+  let C2 = class C3 { constructor() { C3; } }; new C2();
+
+  class C4 { method() { C4; } }; new C4();
+  let C5 = class C6 { method() { C6; } }; new C5();
+
+  class C7 { static method() { C7; } }; new C7();
+  let C8 = class C9 { static method() { C9; } }; new C8();
+
+  // Regression test for unnamed classes.
+  let C10 = class { m() { var1; } };
+
+  class COuter {
+    m() {
+      class CInner {
+        // Here we can refer to COuter but not to CInner (see corresponding assertion test):

[Dmitry Lomov (no reviews), 2015/03/07 18:17:10]

line length

[marja, 2015/03/09 10:01:38]

Done.

+        [({ m() { COuter; return 'A'; } }).m()]() { return 'B'; }
+        // And here we can refer to both:
+        n() { COuter; CInner; }
+      }
+      return new CInner();
+    }
+  }
+  (new COuter()).m().n();
 })();