Improve @mustBeConst verifier

Remove use of the constant evaluator, in favor
of simpler and faster type checks.

Also fixes #55573.

Change-Id: I803144c0e3bb1c5e0dcbf86933901f0ae4e2311b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/387721
Commit-Queue: Moritz Sümmermann <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>

Author: mosuem

pkg/analyzer/lib/src/dart/ast/constant_evaluator.dart

@@ -92,6 +92,7 @@ import 'package:analyzer/dart/element/element.dart';
 /// In addition, this class defines several values that can be returned to
 /// indicate various conditions encountered during evaluation. These are
 /// documented with the static fields that define those values.
+@Deprecated('This has no uses in package:analyzer and not exhaustive.')
 class ConstantEvaluator extends GeneralizingAstVisitor<Object> {
   /// The value returned for expressions (or non-expression nodes) that are not
   /// compile-time constant expressions.

pkg/analyzer/lib/src/error/const_argument_verifier.dart

@@ -6,9 +6,10 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/error/listener.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/error/codes.dart';
 
@@ -17,10 +18,7 @@ import 'package:analyzer/src/error/codes.dart';
 class ConstArgumentsVerifier extends SimpleAstVisitor<void> {
   final ErrorReporter _errorReporter;
 
-  final ConstantEvaluator _constantEvaluator;
-
-  ConstArgumentsVerifier(this._errorReporter)
-      : _constantEvaluator = ConstantEvaluator();
+  ConstArgumentsVerifier(this._errorReporter);
 
   @override
   void visitAssignmentExpression(AssignmentExpression node) {
@@ -114,15 +112,7 @@ class ConstArgumentsVerifier extends SimpleAstVisitor<void> {
         } else {
           resolvedArgument = argument;
         }
-        if (resolvedArgument is Identifier) {
-          var staticElement = resolvedArgument.staticElement;
-          if (staticElement != null &&
-              staticElement.nonSynthetic is ConstVariableElement) {
-            return;
-          }
-        }
-        if (resolvedArgument.accept(_constantEvaluator) ==
-            ConstantEvaluator.NOT_A_CONSTANT) {
+        if (!_isConst(resolvedArgument)) {
           _errorReporter.atNode(
             argument,
             WarningCode.NON_CONST_ARGUMENT_FOR_CONST_PARAMETER,
@@ -132,4 +122,35 @@ class ConstArgumentsVerifier extends SimpleAstVisitor<void> {
       }
     }
   }
+
+  bool _isConst(Expression expression) {
+    if (expression.inConstantContext) {
+      return true;
+    } else if (expression is InstanceCreationExpression && expression.isConst) {
+      return true;
+    } else if (expression is Literal) {
+      return switch (expression) {
+        BooleanLiteral() => true,
+        DoubleLiteral() => true,
+        IntegerLiteral() => true,
+        NullLiteral() => true,
+        SimpleStringLiteral() => true,
+        AdjacentStrings() => true,
+        SymbolLiteral() => true,
+        RecordLiteral() => expression.isConst,
+        TypedLiteral() => expression.isConst,
+        // TODO(mosum): Expand the logic to check if the individual interpolation elements are const.
+        StringInterpolation() => false,
+      };
+    } else if (expression is Identifier) {
+      var staticElement = expression.staticElement;
+      if (staticElement != null) {
+        if ((staticElement is VariableElement && staticElement.isConst) ||
+            staticElement.nonSynthetic is ConstVariableElement) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
 }

pkg/analyzer/test/src/dart/ast/constant_evaluator_test.dart

@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// ignore_for_file: deprecated_member_use_from_same_package
+
 import 'package:analyzer/src/dart/ast/constant_evaluator.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:test/test.dart';

pkg/analyzer/test/src/diagnostics/non_const_argument_for_const_parameter_test.dart

@@ -21,6 +21,18 @@ class ConstAnnotationTest extends PubPackageResolutionTest {
     writeTestPackageConfigWithMeta();
   }
 
+  test_adjacentLiteral_succeeds() async {
+    await assertNoErrorsInCode(r'''
+import 'package:meta/meta.dart' show mustBeConst;
+
+final c = C('H' 'ello');
+
+class C {
+  C(@mustBeConst String s);
+}
+''');
+  }
+
   test_binaryOperator_fails() async {
     await assertErrorsInCode(r'''
 import 'package:meta/meta.dart' show mustBeConst;
@@ -55,6 +67,22 @@ class A {
 ''');
   }
 
+  test_constExpression_succeeds() async {
+    await assertNoErrorsInCode(r'''
+import 'package:meta/meta.dart' show mustBeConst;
+
+void f() {
+  g(const C());
+}
+
+void g(@mustBeConst C c) {}
+
+class C {
+  const C();
+}
+''');
+  }
+
   test_constructor_constantLiteral_succeeds() async {
     await assertNoErrorsInCode(r'''
 import 'package:meta/meta.dart' show mustBeConst;
@@ -164,6 +192,22 @@ class A {
     ]);
   }
 
+  test_interpolationLiteral_fails() async {
+    await assertErrorsInCode(r'''
+import 'package:meta/meta.dart' show mustBeConst;
+
+const a = 'ello';
+
+final c = C('H$a');
+
+class C {
+  C(@mustBeConst String s);
+}
+''', [
+      error(WarningCode.NON_CONST_ARGUMENT_FOR_CONST_PARAMETER, 82, 5),
+    ]);
+  }
+
   test_localFunction_constantLiteral_succeeds() async {
     await assertNoErrorsInCode(r'''
 import 'package:meta/meta.dart' show mustBeConst;