Elements. Remove 'variable' and 'toFunctionValue' from DartObjectImpl.

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

Author: scheglov

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

@@ -156,7 +156,10 @@ class ConstantEvaluationEngine {
             }
 
             // Associate with the variable.
-            dartConstant = DartObjectImpl.forVariable(dartConstant, constant);
+            dartConstant = DartObjectImpl.forVariable(
+              dartConstant,
+              constant.element,
+            );
           }
 
           var enumConstant = _enumConstant(constant);
@@ -2173,8 +2176,8 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     FunctionReferenceImpl node,
     DartObjectImpl value,
   ) {
-    var functionElement = value.toFunctionValue();
-    if (functionElement is! ExecutableElementOrMember) {
+    var functionElement = value.toFunctionValue2();
+    if (functionElement is! ExecutableElement2OrMember) {
       return value;
     }
     var valueType = functionElement.type;
@@ -2208,8 +2211,8 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   ) {
     // TODO(srawlins): When all code uses [FunctionReference]s generated via
     // generic function instantiation, remove this method and all call sites.
-    var functionElement = value.toFunctionValue();
-    if (functionElement is! ExecutableElementOrMember) {
+    var functionElement = value.toFunctionValue2();
+    if (functionElement is! ExecutableElement2OrMember) {
       return value;
     }
     var valueType = functionElement.type;

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

@@ -24,7 +24,6 @@ import 'package:analyzer/src/dart/element/extensions.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/error/codes.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:meta/meta.dart';
 
 /// The state of an object representing a boolean value.
@@ -183,24 +182,24 @@ class DartObjectImpl implements DartObject, Constant {
   /// The state of the object.
   final InstanceState state;
 
-  /// If this object is the value of a constant variable, the variable.
-  final VariableFragmentImpl? variable;
+  @override
+  final VariableElementImpl? variable2;
 
   /// Initialize a newly created object to have the given [type] and [state].
   factory DartObjectImpl(
     TypeSystemImpl typeSystem,
     TypeImpl type,
     InstanceState state, {
-    VariableFragmentImpl? variable,
+    VariableElementImpl? variable,
   }) {
     type = type.extensionTypeErasure;
-    return DartObjectImpl._(typeSystem, type, state, variable: variable);
+    return DartObjectImpl._(typeSystem, type, state, variable2: variable);
   }
 
   /// Creates a duplicate instance of [other], tied to [variable].
   factory DartObjectImpl.forVariable(
     DartObjectImpl other,
-    VariableFragmentImpl variable,
+    VariableElementImpl variable,
   ) {
     return DartObjectImpl(
       other._typeSystem,
@@ -249,7 +248,7 @@ class DartObjectImpl implements DartObject, Constant {
   }
 
   /// Initialize a newly created object to have the given [type] and [state].
-  DartObjectImpl._(this._typeSystem, this.type, this.state, {this.variable}) {
+  DartObjectImpl._(this._typeSystem, this.type, this.state, {this.variable2}) {
     if (state case GenericState state) {
       state._object = this;
     }
@@ -290,9 +289,6 @@ class DartObjectImpl implements DartObject, Constant {
   @visibleForTesting
   List<DartType>? get typeArguments => (state as FunctionState).typeArguments;
 
-  @override
-  VariableElement? get variable2 => variable.asElement2 as VariableElement?;
-
   @override
   bool operator ==(Object other) {
     if (other is DartObjectImpl) {
@@ -951,16 +947,6 @@ class DartObjectImpl implements DartObject, Constant {
     return null;
   }
 
-  /// Return an element corresponding to the value of the object being
-  /// represented, or `null`
-  /// if
-  /// * this object is not of a function type,
-  /// * the value of the object being represented is not known, or
-  /// * the value of the object being represented is `null`.
-  ExecutableElementOrMember? toFunctionValue() {
-    return toFunctionValue2()?.asElement;
-  }
-
   @override
   ExecutableElement2OrMember? toFunctionValue2() {
     var state = this.state;