Elements. Move 'redirectedConstructor' property into 'ConstructorElementImpl'.

Change-Id: I9e39d5ae78c14d184bbdb22fe979b5c419d78c62
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/436660
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -110,7 +110,7 @@ testFineAfterLibraryAnalyzerHook;
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 480;
+  static const int DATA_VERSION = 481;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -489,7 +489,7 @@ class ConstantEvaluationEngine {
       // let [evaluateInstanceCreationExpression] handle it specially.
       return null;
     }
-    var redirectedConstructor = constructor.redirectedConstructor;
+    var redirectedConstructor = constructor.asElement2.redirectedConstructor2;
     if (redirectedConstructor == null) {
       // This can happen if constructor is an external factory constructor.
       return null;
@@ -500,7 +500,7 @@ class ConstantEvaluationEngine {
       // [ErrorVerifier.checkForRedirectToNonConstConstructor()]).
       return null;
     }
-    return redirectedConstructor;
+    return redirectedConstructor.asElement as ConstructorElementMixin;
   }
 
   static _EnumConstant? _enumConstant(VariableFragmentImpl element) {

pkg/analyzer/lib/src/dart/element/element.dart

@@ -757,6 +757,9 @@ class ConstructorElementImpl extends ExecutableElementImpl
   @override
   final ConstructorFragmentImpl firstFragment;
 
+  /// The constructor to which this constructor is redirecting.
+  ConstructorElementMixin2? _redirectedConstructor;
+
   /// The super-constructor which this constructor is invoking, or `null` if
   /// this constructor is not generative, or is redirecting, or the
   /// super-constructor is not resolved, or the enclosing class is `Object`.
@@ -852,11 +855,12 @@ class ConstructorElementImpl extends ExecutableElementImpl
 
   @override
   ConstructorElementMixin2? get redirectedConstructor2 {
-    return firstFragment.redirectedConstructor?.asElement2;
+    _ensureReadResolution();
+    return _redirectedConstructor;
   }
 
   set redirectedConstructor2(ConstructorElementMixin2? value) {
-    firstFragment.redirectedConstructor = value?.asElement;
+    _redirectedConstructor = value;
   }
 
   @override
@@ -914,8 +918,6 @@ mixin ConstructorElementMixin
   @override
   LibraryElementImpl get library2;
 
-  ConstructorElementMixin? get redirectedConstructor;
-
   @override
   InterfaceTypeImpl get returnType;
 }
@@ -939,9 +941,6 @@ class ConstructorFragmentImpl extends ExecutableFragmentImpl
     implements ConstructorFragment {
   late final ConstructorElementImpl element;
 
-  /// The constructor to which this constructor is redirecting.
-  ConstructorElementMixin? _redirectedConstructor;
-
   /// The initializers for this constructor (used for evaluating constant
   /// instance creation expressions).
   List<ConstructorInitializer> _constantInitializers = const [];
@@ -1074,16 +1073,6 @@ class ConstructorFragmentImpl extends ExecutableFragmentImpl
   @override
   int get offset => isSynthetic ? enclosingElement3.offset : _nameOffset;
 
-  @override
-  ConstructorElementMixin? get redirectedConstructor {
-    _ensureReadResolution();
-    return _redirectedConstructor;
-  }
-
-  set redirectedConstructor(ConstructorElementMixin? redirectedConstructor) {
-    _redirectedConstructor = redirectedConstructor;
-  }
-
   @override
   InterfaceTypeImpl get returnType {
     var result = _returnType;

pkg/analyzer/lib/src/dart/element/member.dart

@@ -87,15 +87,10 @@ class ConstructorMember extends ExecutableMember
   @override
   String? get name3 => _element2.name3;
 
-  @override
-  ConstructorElementMixin? get redirectedConstructor {
-    var element = declaration.redirectedConstructor;
-    return _redirect(element);
-  }
-
   @override
   ConstructorElementMixin2? get redirectedConstructor2 {
-    return redirectedConstructor?.asElement2;
+    var element = baseElement.redirectedConstructor2;
+    return _redirect(element);
   }
 
   @override
@@ -107,14 +102,9 @@ class ConstructorMember extends ExecutableMember
   @override
   Source get source => _declaration.source!;
 
-  ConstructorElementMixin? get superConstructor {
-    var element = declaration.element.superConstructor2;
-    return _redirect(element?.firstFragment as ConstructorElementMixin?);
-  }
-
   @override
   ConstructorElementMixin2? get superConstructor2 {
-    return _redirect2(declaration.element.superConstructor2);
+    return _redirect(declaration.element.superConstructor2);
   }
 
   @override
@@ -130,28 +120,7 @@ class ConstructorMember extends ExecutableMember
     builder.writeConstructorElement(this);
   }
 
-  ConstructorElementMixin? _redirect(ConstructorElementMixin? element) {
-    switch (element) {
-      case null:
-        return null;
-      case ConstructorFragmentImpl():
-        return element;
-      case ConstructorMember():
-        var memberMap = element.substitution.map;
-        var map = <TypeParameterElement, DartType>{
-          for (var MapEntry(:key, :value) in memberMap.entries)
-            key: substitution.substituteType(value),
-        };
-        return ConstructorMember(
-          declaration: element.declaration,
-          substitution: Substitution.fromMap2(map),
-        );
-      default:
-        throw UnimplementedError('(${element.runtimeType}) $element');
-    }
-  }
-
-  ConstructorElementMixin2? _redirect2(ConstructorElementMixin2? element) {
+  ConstructorElementMixin2? _redirect(ConstructorElementMixin2? element) {
     switch (element) {
       case null:
         return null;

pkg/analyzer/lib/src/summary2/bundle_reader.dart

@@ -368,7 +368,8 @@ class LibraryReader {
           var enclosingElement =
               element.enclosingElement as InstanceElementImpl;
           reader._addTypeParameters2(enclosingElement.typeParameters2);
-          element.superConstructor2 = reader.readConstructorElementMixin2();
+          element.superConstructor2 = reader.readConstructorElementMixin();
+          element.redirectedConstructor2 = reader.readConstructorElementMixin();
         }),
       );
 
@@ -411,7 +412,6 @@ class LibraryReader {
         );
         _readFragmentMetadata(fragment, reader);
         fragment.returnType = reader.readRequiredType();
-        fragment.redirectedConstructor = reader.readConstructorElementMixin();
         fragment.constantInitializers = reader.readNodeList();
       });
 
@@ -1568,12 +1568,7 @@ class ResolutionReader {
     return _reader.readByte();
   }
 
-  ConstructorElementMixin? readConstructorElementMixin() {
-    var element2 = readElement() as ConstructorElement?;
-    return element2?.asElement as ConstructorElementMixin?;
-  }
-
-  ConstructorElementMixin2? readConstructorElementMixin2() {
+  ConstructorElementMixin2? readConstructorElementMixin() {
     return readElement() as ConstructorElementMixin2?;
   }
 

pkg/analyzer/lib/src/summary2/bundle_writer.dart

@@ -202,6 +202,7 @@ class BundleWriter {
         // TODO(scheglov): avoid cast
         _resolutionSink.withTypeParameters(element.typeParameters2.cast(), () {
           _resolutionSink.writeElement(element.superConstructor2);
+          _resolutionSink.writeElement(element.redirectedConstructor2);
           // TODO(scheglov): formal parameters
         });
       });
@@ -218,7 +219,6 @@ class BundleWriter {
       _sink.writeList(fragment.formalParameters, _writeParameterElement);
       _resolutionSink._writeMetadata(fragment.metadata);
       _resolutionSink.writeType(fragment.returnType);
-      _resolutionSink.writeElement(fragment.redirectedConstructor?.asElement2);
       _resolutionSink._writeNodeList(fragment.constantInitializers);
     });
   }