commit be1e7497c80c0e11dd36663a2aa4c6bf9a7f369d
author Sam Rawlins <srawlins@google.com> Mon May 01 19:52:58 2023 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 01 19:52:58 2023 +0000
tree 5ae9c735b5ee7a1d794a2fa805278aba995438d2
parent f7e8677ff660d8f497ebcdd8ea7d38f90e03fb87

[analyzer] simplify AbstractClassElementImpl.supertype

Change-Id: I68eda760a8e55b537d5acbc1c62bfe29e4a32309
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/300142
Commit-Queue: Samuel Rawlins <srawlins@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>

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

diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index d615228..8d80404 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -62,7 +62,8 @@
     with TypeParameterizedElementMixin, HasCompletionData, MacroTargetElement
     implements InterfaceElement {
   /// The superclass of the class, or `null` for [Object].
-  InterfaceType? _supertype;
+  @override
+  InterfaceType? supertype;
 
   /// A list containing all of the mixins that are applied to the class being
   /// extended in order to derive the superclass of this class.
@@ -191,21 +192,6 @@
   }
 
   @override
-  InterfaceType? get supertype {
-    if (_supertype != null) return _supertype!;
-
-    if (hasModifier(Modifier.DART_CORE_OBJECT)) {
-      return null;
-    }
-
-    return _supertype;
-  }
-
-  set supertype(InterfaceType? supertype) {
-    _supertype = supertype;
-  }
-
-  @override
   InterfaceType get thisType {
     if (_thisType == null) {
       List<DartType> typeArguments;