[cfe] Remove the need for TypeInferrer.constantContext

This changes the body builder to create an InvalidExpression for new expressions in constant contexts, thus avoiding the need to handle this case in the inference, avoiding the need for passing constantContext to the inferrer.

Change-Id: Ia8d5b3a6462e7a1570a092d5808bf262345b424b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/451021
Reviewed-by: Chloe Stefantsova <[email protected]>
Reviewed-by: Erik Ernst <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/fragment/constructor/body_builder_context.dart

@@ -139,12 +139,10 @@ class ConstructorBodyBuilderContext extends BodyBuilderContext {
   InitializerInferenceResult inferInitializer({
     required TypeInferrer typeInferrer,
     required Uri fileUri,
-    required ConstantContext constantContext,
     required Initializer initializer,
   }) {
     return typeInferrer.inferInitializer(
       fileUri: fileUri,
-      constantContext: constantContext,
       constructorBuilder: _builder,
       initializer: initializer,
     );

pkg/front_end/lib/src/fragment/factory/encoding.dart

@@ -7,7 +7,6 @@ import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
 
-import '../../base/constant_context.dart';
 import '../../base/identifiers.dart';
 import '../../base/lookup_result.dart';
 import '../../base/messages.dart';
@@ -282,7 +281,6 @@ class FactoryEncoding implements InferredTypeListener {
         targetType: target.function!.computeFunctionType(
           Nullability.nonNullable,
         ),
-        constantContext: ConstantContext.none,
       );
       if (typeArguments == null) {
         assert(

pkg/front_end/lib/src/fragment/field/declaration.dart

@@ -10,7 +10,6 @@ import 'package:kernel/core_types.dart';
 import 'package:kernel/type_environment.dart';
 
 import '../../api_prototype/experimental_flags.dart';
-import '../../base/constant_context.dart';
 import '../../base/messages.dart';
 import '../../base/problems.dart';
 import '../../base/scope.dart';
@@ -314,15 +313,13 @@ class RegularFieldDeclaration
     required TypeInferrer typeInferrer,
     required CoreTypes coreTypes,
     required Uri fileUri,
-    required ConstantContext constantContext,
     Expression? initializer,
   }) {
     if (initializer != null) {
       if (!hasBodyBeenBuilt) {
         initializer = typeInferrer
             .inferFieldInitializer(
               fileUri: fileUri,
-              constantContext: constantContext,
               declaredType: fieldType,
               initializer: initializer,
             )
@@ -920,7 +917,6 @@ abstract class FieldFragmentDeclaration {
     required TypeInferrer typeInferrer,
     required CoreTypes coreTypes,
     required Uri fileUri,
-    required ConstantContext constantContext,
     Expression? initializer,
   });
 

pkg/front_end/lib/src/fragment/primary_constructor_field.dart

@@ -130,15 +130,13 @@ class PrimaryConstructorFieldDeclaration
     required TypeInferrer typeInferrer,
     required CoreTypes coreTypes,
     required Uri fileUri,
-    required ConstantContext constantContext,
     Expression? initializer,
   }) {
     if (initializer != null) {
       if (!hasBodyBeenBuilt) {
         initializer = typeInferrer
             .inferFieldInitializer(
               fileUri: fileUri,
-              constantContext: constantContext,
               declaredType: fieldType,
               initializer: initializer,
             )

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

@@ -365,7 +365,7 @@ class BodyBuilderImpl extends StackListenerImpl
     required this.uri,
     required this.assignedVariables,
     required this.typeEnvironment,
-    required this.constantContext,
+    required ConstantContext constantContext,
   }) : _context = context,
        forest = const Forest(),
        enableNative = libraryBuilder.loader.target.backendTarget.enableNative(
@@ -377,6 +377,7 @@ class BodyBuilderImpl extends StackListenerImpl
        benchmarker = libraryBuilder.loader.target.benchmarker,
        _localScopes = new LocalStack([enclosingScope]),
        _labelScopes = new LocalStack([new LabelScopeImpl()]) {
+    this.constantContext = constantContext;
     if (formalParameterScope != null) {
       for (VariableBuilder builder in formalParameterScope!.localVariables) {
         assignedVariables.declare(builder.variable!);
@@ -6368,13 +6369,6 @@ class BodyBuilderImpl extends StackListenerImpl
   void beginNewExpression(Token token) {
     debugEvent("beginNewExpression");
     super.push(constantContext);
-    if (constantContext != ConstantContext.none) {
-      addProblem(
-        cfe.codeNotConstantExpression.withArgumentsOld('New expression'),
-        token.charOffset,
-        token.length,
-      );
-    }
     constantContext = ConstantContext.none;
   }
 
@@ -6416,6 +6410,19 @@ class BodyBuilderImpl extends StackListenerImpl
       inMetadata: false,
       inImplicitCreationContext: false,
     );
+    if (constantContext != ConstantContext.none) {
+      pop(); // Pop the created new expression.
+      push(
+        buildProblem(
+          message: cfe.codeNotConstantExpression.withArgumentsOld(
+            'New expression',
+          ),
+          fileUri: uri,
+          fileOffset: token.charOffset,
+          length: token.length,
+        ),
+      );
+    }
   }
 
   void _buildConstructorReferenceInvocation(

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

@@ -375,7 +375,6 @@ abstract class BodyBuilderContext {
   InitializerInferenceResult inferInitializer({
     required TypeInferrer typeInferrer,
     required Uri fileUri,
-    required ConstantContext constantContext,
     required Initializer initializer,
   }) {
     throw new UnsupportedError('${runtimeType}.inferInitializer');

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

@@ -6,9 +6,7 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/src/printer.dart';
 
 import '../base/problems.dart' show unsupported;
-
 import '../type_inference/type_schema.dart';
-
 import 'collections.dart'
     show
         ForElement,
@@ -24,7 +22,6 @@ import 'collections.dart'
         PatternForElement,
         PatternForMapEntry,
         SpreadElement;
-
 import 'internal_ast.dart';
 
 /// A shadow tree factory.

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

@@ -453,12 +453,14 @@ class FactoryConstructorInvocation extends InternalExpression {
   bool hasBeenInferred = false;
   final Procedure target;
   ArgumentsImpl arguments;
+
+  /// If `true`, this invocation is constant, either explicit or inferred.
   final bool isConst;
 
   FactoryConstructorInvocation(
     this.target,
     this.arguments, {
-    this.isConst = false,
+    required this.isConst,
   }) {
     arguments.parent = this;
   }
@@ -548,13 +550,15 @@ class TypeAliasedFactoryInvocation extends InternalExpression {
   final TypeAliasBuilder typeAliasBuilder;
   final Procedure target;
   ArgumentsImpl arguments;
+
+  /// If `true`, this invocation is constant, either explicit or inferred.
   final bool isConst;
 
   TypeAliasedFactoryInvocation(
     this.typeAliasBuilder,
     this.target,
     this.arguments, {
-    this.isConst = false,
+    required this.isConst,
   }) {
     arguments.parent = this;
   }
@@ -4456,6 +4460,8 @@ class DotShorthandInvocation extends InternalExpression {
   final Name name;
   final int nameOffset;
   final ArgumentsImpl arguments;
+
+  /// If `true`, this invocation is constant, either explicit or inferred.
   final bool isConst;
 
   DotShorthandInvocation(

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

@@ -122,14 +122,13 @@ class Resolver {
       annotatable.addAnnotation(expression);
     }
     context.inferSingleTargetAnnotation(
-      constantContext: constantContext,
       singleTarget: new SingleTargetAnnotations(
         annotatable,
         indicesOfAnnotationsToBeInferred,
       ),
     );
     // TODO(johnniwinther): We need to process annotations within annotations.
-    context.performBacklog(null, constantContext);
+    context.performBacklog(null);
 
     for (Annotation annotation in annotations) {
       annotation.expression =
@@ -211,7 +210,6 @@ class Resolver {
         problemReporting: problemReporting,
         libraryFeatures: libraryFeatures,
         typeEnvironment: context.typeEnvironment,
-        constantContext: constantContext,
         target: constructorBuilder.invokeTarget,
         arguments: arguments,
         fileUri: fileUri,
@@ -220,14 +218,13 @@ class Resolver {
       ExpressionInferenceResult inferenceResult = context.typeInferrer
           .inferFieldInitializer(
             fileUri: fileUri,
-            constantContext: constantContext,
             declaredType: const UnknownType(),
             initializer: initializer,
           );
       initializer = inferenceResult.expression;
       fieldType = inferenceResult.inferredType;
     }
-    context.performBacklog(result?.annotations, constantContext);
+    context.performBacklog(result?.annotations);
 
     return (initializer, fieldType);
   }
@@ -267,7 +264,6 @@ class Resolver {
     );
     DartType inferredType = context.typeInferrer.inferImplicitFieldType(
       fileUri: fileUri,
-      constantContext: constantContext,
       initializer: result.initializer,
     );
     // TODO(johnniwinther): We through away the initializer and don't process
@@ -307,12 +303,11 @@ class Resolver {
     Expression initializer = context.typeInferrer
         .inferFieldInitializer(
           fileUri: fileUri,
-          constantContext: constantContext,
           declaredType: fieldType,
           initializer: result.initializer,
         )
         .expression;
-    context.performBacklog(result.annotations, constantContext);
+    context.performBacklog(result.annotations);
     return initializer;
   }
 
@@ -359,11 +354,10 @@ class Resolver {
         typeInferrer: context.typeInferrer,
         coreTypes: _coreTypes,
         fileUri: fileUri,
-        constantContext: constantContext,
         initializer: initializer,
       );
     }
-    context.performBacklog(result.annotations, constantContext);
+    context.performBacklog(result.annotations);
   }
 
   void buildFunctionBody({
@@ -430,7 +424,7 @@ class Resolver {
         constantContext: constantContext,
         needsImplicitSuperInitializer: result.needsImplicitSuperInitializer,
       );
-      context.performBacklog(result.annotations, constantContext);
+      context.performBacklog(result.annotations);
     }
     // Coverage-ignore(suite): Not run.
     on DebugAbort {
@@ -510,7 +504,7 @@ class Resolver {
         initializers: initializers,
       );
     }
-    context.performBacklog(result.annotations, constantContext);
+    context.performBacklog(result.annotations);
   }
 
   List<Initializer>? buildInitializersUnfinished({
@@ -581,11 +575,10 @@ class Resolver {
       annotatable.addAnnotation(expression);
     }
     context.inferSingleTargetAnnotation(
-      constantContext: constantContext,
       singleTarget: new SingleTargetAnnotations(annotatable),
     );
     List<Expression> expressions = annotatable.annotations;
-    context.performBacklog(result.annotations, constantContext);
+    context.performBacklog(result.annotations);
     return expressions;
   }
 
@@ -620,9 +613,8 @@ class Resolver {
       initializer: result.initializer,
       declaredType: declaredType,
       hasDeclaredInitializer: hasDeclaredInitializer,
-      constantContext: constantContext,
     );
-    context.performBacklog(result.annotations, constantContext);
+    context.performBacklog(result.annotations);
     return initializer;
   }
 
@@ -686,7 +678,7 @@ class Resolver {
         needsImplicitSuperInitializer: bodyBuilderContext
             .needsImplicitSuperInitializer(_coreTypes),
       );
-      context.performBacklog(result.annotations, constantContext);
+      context.performBacklog(result.annotations);
     }
     // Coverage-ignore(suite): Not run.
     on DebugAbort {
@@ -739,7 +731,7 @@ class Resolver {
     );
     BuildRedirectingFactoryMethodResult result = bodyBuilder
         .buildRedirectingFactoryMethod(token: token, metadata: metadata);
-    context.performBacklog(result.annotations, constantContext);
+    context.performBacklog(result.annotations);
     _benchmarker
         // Coverage-ignore(suite): Not run.
         ?.endSubdivide();
@@ -854,7 +846,6 @@ class Resolver {
           fileUri: fileUri,
           fileOffset: fileOffset,
           returnType: const DynamicType(),
-          constantContext: constantContext,
           asyncMarker: AsyncMarker.Sync,
           body: fakeReturn,
           expressionEvaluationHelper: expressionEvaluationHelper,
@@ -864,7 +855,7 @@ class Resolver {
       "Previously implicit assumption about inferFunctionBody "
       "not returning anything different.",
     );
-    context.performBacklog(result.annotations, constantContext);
+    context.performBacklog(result.annotations);
     return fakeReturn.expression!;
   }
 
@@ -873,7 +864,6 @@ class Resolver {
     required ProblemReporting problemReporting,
     required LibraryFeatures libraryFeatures,
     required TypeEnvironment typeEnvironment,
-    required ConstantContext constantContext,
     required Member target,
     required ArgumentsImpl arguments,
     required Uri fileUri,
@@ -1308,7 +1298,6 @@ class Resolver {
             initializers.length,
             (index) => bodyBuilderContext.inferInitializer(
               typeInferrer: context.typeInferrer,
-              constantContext: constantContext,
               fileUri: fileUri,
               initializer: initializers[index],
             ),
@@ -1585,7 +1574,6 @@ class Resolver {
             .inferInitializer(
               typeInferrer: context.typeInferrer,
               fileUri: fileUri,
-              constantContext: constantContext,
               initializer: initializer,
             );
         if (!bodyBuilderContext.addInferredInitializer(
@@ -1700,7 +1688,6 @@ class Resolver {
               initializer: initializer,
               declaredType: originParameter.type,
               hasDeclaredInitializer: parameter.hasDeclaredInitializer,
-              constantContext: constantContext,
             );
             originParameter.initializer = initializer..parent = originParameter;
             if (initializer is InvalidExpression) {
@@ -1749,7 +1736,6 @@ class Resolver {
         fileUri: fileUri,
         fileOffset: bodyBuilderContext.memberNameOffset,
         returnType: bodyBuilderContext.returnTypeContext,
-        constantContext: constantContext,
         asyncMarker: asyncModifier,
         body: body,
       );