[kernel/CFE] Mark when a VariableDeclaration is a super initializing formal

Tested: Existing tests.
Change-Id: I3d5ccba75c346c7e0cf743b3c2d151428a6bca80
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/399662
Reviewed-by: Alexander Markov <[email protected]>
Commit-Queue: Jens Johansen <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: jensjoha

pkg/front_end/lib/src/builder/formal_parameter_builder.dart

@@ -163,6 +163,7 @@ class FormalParameterBuilder extends BuilderImpl
           isFinal: modifiers.isFinal,
           isConst: false,
           isInitializingFormal: isInitializingFormal,
+          isSuperInitializingFormal: isSuperInitializingFormal,
           isCovariantByDeclaration: isCovariantByDeclaration,
           isRequired: isRequiredNamed,
           hasDeclaredInitializer: hasDeclaredInitializer,

pkg/front_end/lib/src/kernel/forest.dart

@@ -643,6 +643,7 @@ class Forest {
       bool isFinal = false,
       bool isConst = false,
       bool isInitializingFormal = false,
+      bool isSuperInitializingFormal = false,
       bool isCovariantByDeclaration = false,
       bool isLocalFunction = false,
       bool isSynthesized = false}) {
@@ -652,6 +653,7 @@ class Forest {
         isFinal: isFinal,
         isConst: isConst,
         isInitializingFormal: isInitializingFormal,
+        isSuperInitializingFormal: isSuperInitializingFormal,
         isCovariantByDeclaration: isCovariantByDeclaration,
         isLocalFunction: isLocalFunction,
         isSynthesized: isSynthesized,

pkg/front_end/lib/src/kernel/internal_ast.dart

@@ -1179,6 +1179,7 @@ class VariableDeclarationImpl extends VariableDeclaration {
       bool isFinal = false,
       bool isConst = false,
       bool isInitializingFormal = false,
+      bool isSuperInitializingFormal = false,
       bool isCovariantByDeclaration = false,
       bool isLocalFunction = false,
       bool isLate = false,
@@ -1195,6 +1196,7 @@ class VariableDeclarationImpl extends VariableDeclaration {
             isFinal: isFinal,
             isConst: isConst,
             isInitializingFormal: isInitializingFormal,
+            isSuperInitializingFormal: isSuperInitializingFormal,
             isCovariantByDeclaration: isCovariantByDeclaration,
             isLate: isLate,
             isRequired: isRequired,

pkg/kernel/binary.md

@@ -147,7 +147,7 @@ type CanonicalName {
 
 type ComponentFile {
   UInt32 magic = 0x90ABCDEF;
-  UInt32 formatVersion = 120;
+  UInt32 formatVersion = 121;
   Byte[10] shortSdkHash;
   List<String> problemsAsJson; // Described in problems.md.
   Library[] libraries;
@@ -1501,7 +1501,7 @@ type VariableDeclarationPlain {
 
   UInt flags (isFinal, isConst, hasDeclaredInitializer, isInitializingFormal,
               isCovariantByClass, isLate, isRequired, isCovariantByDeclaration,
-              isLowered, isSynthesized, isHoisted, isWildcard);
+              isLowered, isSynthesized, isHoisted, isWildcard, isSuperInitializingFormal);
   // For named parameters, this is the parameter name.
   // For other variables, the name is cosmetic, may be empty,
   // and is not necessarily unique.

pkg/kernel/lib/binary/tag.dart

@@ -226,7 +226,7 @@ class Tag {
   /// Internal version of kernel binary format.
   /// Bump it when making incompatible changes in kernel binaries.
   /// Keep in sync with runtime/vm/kernel_binary.h, pkg/kernel/binary.md.
-  static const int BinaryFormatVersion = 120;
+  static const int BinaryFormatVersion = 121;
 }
 
 abstract class ConstantTag {

pkg/kernel/lib/src/ast/statements.dart

@@ -1443,6 +1443,7 @@ class VariableDeclaration extends Statement implements Annotatable {
       bool isFinal = false,
       bool isConst = false,
       bool isInitializingFormal = false,
+      bool isSuperInitializingFormal = false,
       bool isCovariantByDeclaration = false,
       bool isLate = false,
       bool isRequired = false,
@@ -1458,6 +1459,7 @@ class VariableDeclaration extends Statement implements Annotatable {
       this.isFinal = isFinal;
       this.isConst = isConst;
       this.isInitializingFormal = isInitializingFormal;
+      this.isSuperInitializingFormal = isSuperInitializingFormal;
       this.isCovariantByDeclaration = isCovariantByDeclaration;
       this.isLate = isLate;
       this.isRequired = isRequired;
@@ -1476,6 +1478,7 @@ class VariableDeclaration extends Statement implements Annotatable {
       {bool isFinal = true,
       bool isConst = false,
       bool isInitializingFormal = false,
+      bool isSuperInitializingFormal = false,
       bool isLate = false,
       bool isRequired = false,
       bool isLowered = false,
@@ -1484,6 +1487,7 @@ class VariableDeclaration extends Statement implements Annotatable {
     this.isFinal = isFinal;
     this.isConst = isConst;
     this.isInitializingFormal = isInitializingFormal;
+    this.isSuperInitializingFormal = isSuperInitializingFormal;
     this.isLate = isLate;
     this.isRequired = isRequired;
     this.isLowered = isLowered;
@@ -1515,6 +1519,7 @@ class VariableDeclaration extends Statement implements Annotatable {
   static const int FlagSynthesized = 1 << 9;
   static const int FlagHoisted = 1 << 10;
   static const int FlagWildcard = 1 << 11;
+  static const int FlagSuperInitializingFormal = 1 << 12;
 
   bool get isFinal => flags & FlagFinal != 0;
   bool get isConst => flags & FlagConst != 0;
@@ -1527,6 +1532,12 @@ class VariableDeclaration extends Statement implements Annotatable {
   @informative
   bool get isInitializingFormal => flags & FlagInitializingFormal != 0;
 
+  /// Whether the variable is declared as a super initializing formal parameter
+  /// of a constructor.
+  @informative
+  bool get isSuperInitializingFormal =>
+      flags & FlagSuperInitializingFormal != 0;
+
   /// If this [VariableDeclaration] is a parameter of a method, indicates
   /// whether the method implementation needs to contain a runtime type check to
   /// deal with generic covariance.
@@ -1619,6 +1630,13 @@ class VariableDeclaration extends Statement implements Annotatable {
         : (flags & ~FlagInitializingFormal);
   }
 
+  @informative
+  void set isSuperInitializingFormal(bool value) {
+    flags = value
+        ? (flags | FlagSuperInitializingFormal)
+        : (flags & ~FlagSuperInitializingFormal);
+  }
+
   void set isCovariantByClass(bool value) {
     flags = value
         ? (flags | FlagCovariantByClass)

pkg/kernel/lib/text/debug_printer.dart

@@ -85,7 +85,8 @@ class DebugPrinter extends VisitorDefault<void>
       'name': '${node.name ?? '--unnamed--'}',
       'isFinal': '${node.isFinal}',
       'isConst': '${node.isConst}',
-      'isInitializingFormal': '${node.isInitializingFormal}'
+      'isInitializingFormal': '${node.isInitializingFormal}',
+      'isSuperInitializingFormal': '${node.isSuperInitializingFormal}'
     });
     node.visitChildren(this);
     closeNode();

runtime/vm/kernel_binary.h

@@ -18,7 +18,7 @@ namespace kernel {
 // package:kernel/binary.md.
 
 static const uint32_t kMagicProgramFile = 0x90ABCDEFu;
-static const uint32_t kSupportedKernelFormatVersion = 120;
+static const uint32_t kSupportedKernelFormatVersion = 121;
 
 // Keep in sync with package:kernel/lib/binary/tag.dart
 #define KERNEL_TAG_LIST(V)                                                     \