PreParser scope analysis: sloppy block funcs.

test/cctest/test-parsing.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 8597 matching lines @@
       {"function inner() { for (let {x: my_var} of []) { } my_var; }", true},
       {"function inner() { for (let {my_var} in {}) { } my_var; }", true},
       {"function inner() { for (let {my_var} of []) { } my_var; }", true},
       {"function inner() { for (let {y, x: my_var} in {}) { } my_var; }", true},
       {"function inner() { for (let {y, x: my_var} of []) { } my_var; }", true},
       {"function inner() { for (let {a, my_var} in {}) { } my_var; }", true},
       {"function inner() { for (let {a, my_var} of []) { } my_var; }", true},
       {"function inner() { for (let my_var = 0; my_var < 1; ++my_var) { } "
        "my_var }",
        true},
+      {"function inner() { 'use strict'; if (true) { function my_var() {} }  "
+       "my_var; }",
+       true},
+      {"function inner() { 'use strict'; function inner2() { if (true) { "
+       "function my_var() {} }  my_var; } }",
+       true},
+      {"function inner() { function inner2() { 'use strict'; if (true) { "
+       "function my_var() {} }  my_var; } }",
+       true},
+      {"function inner() { () => { 'use strict'; if (true) { function my_var() "
+       "{} }  my_var; } }",
+       true},
+      {"function inner() { if (true) { let my_var; if (true) { function "
+       "my_var() {} } }  my_var; }",
+       true},
       // No pessimistic context allocation:
       {"function inner() { var my_var; my_var; }", false},
       {"function inner() { var my_var; }", false},
       {"function inner() { var my_var = 0; }", false},
       {"function inner() { if (true) { var my_var; } my_var; }", false},
       {"function inner() { let my_var; my_var; }", false},
       {"function inner() { let my_var; }", false},
       {"function inner() { let my_var = 0; }", false},
       {"function inner() { const my_var = 0; my_var; }", false},
       {"function inner() { const my_var = 0; }", false},
@@ skipping 171 matching lines @@
       {"function inner() { for (var my_var = 0; my_var < 1; ++my_var) { } "
        "my_var }",
        false},
       {"function inner() { for (let a = 0, my_var = 0; my_var < 1; ++my_var) { "
        "my_var } }",
        false},
       {"function inner() { for (var a = 0, my_var = 0; my_var < 1; ++my_var) { "
        "my_var } }",
        false},
       {"function inner() { class my_var {}; my_var }", false},
-      // In the following cases we still context allocate pessimistically:
-      {"function inner() { function my_var() {} my_var; }", true},
+      {"function inner() { function my_var() {} my_var; }", false},
       {"function inner() { if (true) { function my_var() {} }  my_var; }",
-       true},
+       false},
+      {"function inner() { function inner2() { if (true) { function my_var() "
+       "{} }  my_var; } }",
+       false},
+      {"function inner() { () => { if (true) { function my_var() {} }  my_var; "
+       "} }",
+       false},
+      {"function inner() { if (true) { var my_var; if (true) { function "
+       "my_var() {} } }  my_var; }",
+       false},
   };
 
   for (unsigned i = 0; i < arraysize(inners); ++i) {
     const char* inner = inners[i].source;
     int inner_len = Utf8LengthHelper(inner);
     int len = prefix_len + inner_len + suffix_len;
     i::ScopedVector<char> program(len + 1);
     i::SNPrintF(program, "%s%s%s", prefix, inner, suffix);
     i::Handle<i::String> source =
         factory->InternalizeUtf8String(program.start());
@@ skipping 12 matching lines @@
     DCHECK_NOT_NULL(scope);
     DCHECK_NULL(scope->sibling());
     DCHECK(scope->is_function_scope());
     const i::AstRawString* var_name =
         info.ast_value_factory()->GetOneByteString("my_var");
     i::Variable* var = scope->Lookup(var_name);
     CHECK_EQ(inners[i].ctxt_allocate,
              i::ScopeTestHelper::MustAllocateInContext(var));
   }
 }