Remove StaticInvocationJudgment

Change-Id: I52da9574e99307bd7afad440100491ac5264f1a0
Reviewed-on: https://dart-review.googlesource.com/c/80602
Commit-Queue: Peter von der Ahé <ahe@google.com>
Reviewed-by: Kevin Millikin <kmillikin@google.com>

Author: peter-ahe-google

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

@@ -3068,7 +3068,7 @@ abstract class BodyBuilder extends ScopeListener<JumpTarget>
         library.checkBoundsInFactoryInvocation(node, typeEnvironment);
         return node;
       } else {
-        StaticInvocation node = new StaticInvocationJudgment(
+        StaticInvocation node = new StaticInvocation(
             target, forest.castArguments(arguments),
             isConst: isConst)
           ..fileOffset = charOffset;

pkg/front_end/lib/src/fasta/kernel/inference_visitor.dart

@@ -1060,21 +1060,18 @@ class InferenceVistor extends BodyVisitor1<void, DartType> {
     inferrer.storeInferredType(node, type);
   }
 
-  void visitStaticInvocationJudgment(
-      StaticInvocationJudgment node, DartType typeContext) {
+  @override
+  void visitStaticInvocation(StaticInvocation node, DartType typeContext) {
     FunctionType calleeType = node.target != null
         ? node.target.function.functionType
         : new FunctionType([], const DynamicType());
     bool hadExplicitTypeArguments =
-        getExplicitTypeArguments(node.argumentJudgments) != null;
+        getExplicitTypeArguments(node.arguments) != null;
     var inferenceResult = inferrer.inferInvocation(typeContext, node.fileOffset,
-        calleeType, calleeType.returnType, node.argumentJudgments);
-    node.inferredType = inferenceResult.type;
-    KernelLibraryBuilder inferrerLibrary = inferrer.library;
-    if (!hadExplicitTypeArguments &&
-        node.target != null &&
-        inferrerLibrary is KernelLibraryBuilder) {
-      inferrerLibrary.checkBoundsInStaticInvocation(
+        calleeType, calleeType.returnType, node.arguments);
+    inferrer.storeInferredType(node, inferenceResult.type);
+    if (!hadExplicitTypeArguments && node.target != null) {
+      inferrer.library?.checkBoundsInStaticInvocation(
           node, inferrer.typeSchemaEnvironment,
           inferred: true);
     }

pkg/front_end/lib/src/fasta/kernel/inferred_type_visitor.dart

@@ -142,4 +142,10 @@ class InferredTypeVisitor
   DartType visitStaticGet(StaticGet node, TypeInferrerImpl inferrer) {
     return inferrer.readInferredType(node);
   }
+
+  @override
+  DartType visitStaticInvocation(
+      StaticInvocation node, TypeInferrerImpl inferrer) {
+    return inferrer.readInferredType(node);
+  }
 }

pkg/front_end/lib/src/fasta/kernel/kernel_ast_api.dart

@@ -115,7 +115,6 @@ export 'kernel_shadow_ast.dart'
         ReturnJudgment,
         ShadowLargeIntLiteral,
         StaticAssignmentJudgment,
-        StaticInvocationJudgment,
         SuperInitializerJudgment,
         SuperMethodInvocationJudgment,
         SuperPropertyGetJudgment,

pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart

@@ -1329,23 +1329,6 @@ class StaticAssignmentJudgment extends ComplexAssignmentJudgment {
   }
 }
 
-/// Shadow object for [StaticInvocation].
-class StaticInvocationJudgment extends StaticInvocation
-    implements ExpressionJudgment {
-  DartType inferredType;
-
-  StaticInvocationJudgment(Procedure target, ArgumentsJudgment arguments,
-      {bool isConst: false})
-      : super(target, arguments, isConst: isConst);
-
-  ArgumentsJudgment get argumentJudgments => arguments;
-
-  @override
-  void acceptInference(InferenceVistor visitor, DartType typeContext) {
-    return visitor.visitStaticInvocationJudgment(this, typeContext);
-  }
-}
-
 /// Concrete shadow object representing a super initializer in kernel form.
 class SuperInitializerJudgment extends SuperInitializer
     implements InitializerJudgment {