Assign unique IDs to FunctionLiterals

src/parsing/preparser.h

 // Copyright 2012 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.
 
 #ifndef V8_PARSING_PREPARSER_H
 #define V8_PARSING_PREPARSER_H
 
 #include "src/ast/scopes.h"
 #include "src/parsing/parser-base.h"
 
@@ skipping 644 matching lines @@
                                         int pos) {
     return PreParserStatement::Jump();
   }
   PreParserExpression NewFunctionLiteral(
       PreParserIdentifier name, Scope* scope, PreParserStatementList body,
       int materialized_literal_count, int expected_property_count,
       int parameter_count, int function_length,
       FunctionLiteral::ParameterFlag has_duplicate_parameters,
       FunctionLiteral::FunctionType function_type,
       FunctionLiteral::EagerCompileHint eager_compile_hint, int position,
-      bool has_braces) {
+      bool has_braces, int function_literal_num) {
     return PreParserExpression::Default();
   }
 
   PreParserExpression NewSpread(PreParserExpression expression, int pos,
                                 int expr_pos) {
     return PreParserExpression::Spread(expression);
   }
 
   PreParserExpression NewEmptyParentheses(int pos) {
     return PreParserExpression::Default();
@@ skipping 397 matching lines @@
   DeclareClass(PreParserIdentifier variable_name, PreParserExpression value,
                ZoneList<const AstRawString*>* names, int class_token_pos,
                int end_pos, bool* ok) {
     return PreParserStatement::Default();
   }
   V8_INLINE void DeclareClassVariable(PreParserIdentifier name,
                                       Scope* block_scope, ClassInfo* class_info,
                                       int class_token_pos, bool* ok) {}
   V8_INLINE void DeclareClassProperty(PreParserIdentifier class_name,
                                       PreParserExpression property,
-                                      ClassInfo* class_info, bool* ok) {}
+                                      ClassLiteralProperty::Kind kind,
+                                      bool is_static, ClassInfo* class_info,
+                                      bool* ok) {
+    if (class_info->has_seen_constructor &&
+        !class_info->constructor.IsEmpty()) {
+      // We use Empty to differentiate an existing constructor from Default
+      // which encodes the absence of a constructor.
+      class_info->constructor = PreParserExpression::Empty();

[marja, 2016/11/18 10:51:10]

Hmm, why does this matter?

[jochen (gone - plz use gerrit), 2016/11/21 08:03:47]

When the ParserBase defines the constructor, it sets has_seen_constructor to
true and invokes DeclareClassProperty. However, all further calls to
DeclareClassProperty will also have has_seen_constructor set to true, so we can
need to also look at constructor. This is more or less the same code that Parser
has

+      return;
+    }
+    if (kind == ClassLiteralProperty::FIELD && !is_static) {
+      class_info->instance_field_initializers->Add(
+          PreParserExpression::Default(), zone());
+    }
+  }
   V8_INLINE PreParserExpression RewriteClassLiteral(PreParserIdentifier name,
                                                     ClassInfo* class_info,
                                                     int pos, bool* ok) {
+    bool has_default_constructor = !class_info->has_seen_constructor;
+    bool has_instance_fields =

[marja, 2016/11/18 10:51:10]

Where's the equivalent thing for these on the parser side?

[jochen (gone - plz use gerrit), 2016/11/21 08:03:47]

In Parser::RewriteClassLiteral - it's exactly the same code

+        class_info->instance_field_initializers->length() > 0;
+    // Account for the default constructor.
+    if (has_default_constructor) GetNextFunctionLiteralNum();
+    if (allow_harmony_class_fields() && has_instance_fields) {
+      // Account for initializer function.
+      GetNextFunctionLiteralNum();
+    }
     return PreParserExpression::Default();
   }
 
   V8_INLINE PreParserStatement DeclareNative(PreParserIdentifier name, int pos,
                                              bool* ok) {
     return PreParserStatement::Default();
   }
 
   V8_INLINE void QueueDestructuringAssignmentForRewriting(
       PreParserExpression assignment) {}
@@ skipping 462 matching lines @@
     function_state_->NextMaterializedLiteralIndex();
     function_state_->NextMaterializedLiteralIndex();
   }
   return EmptyExpression();
 }
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_PARSING_PREPARSER_H