[vm] Cleanup code related to interface calls through fields/getters from TFA and bytecode generator

Since https://dart-review.googlesource.com/c/sdk/+/129702 CFE desugars
interface calls through fields/getters, so there is no need to handle
them in the TFA and bytecode generator.

Note that VM can still see such calls if they are dynamic, so
handling of such calls is not removed entirely from TFA or VM.
Also, VM should support those as long as it supports older kernel
binary versions.

Issue: #34497
Change-Id: Ic49f109b0e9264f0e20a7e1a3b7a46011fa76c86
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/137700
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Alexander Markov <[email protected]>

Author: alexmarkov

pkg/vm/lib/bytecode/gen_bytecode.dart

@@ -42,7 +42,6 @@ import 'generics.dart'
         hasFreeTypeParameters,
         hasInstantiatorTypeArguments,
         isAllDynamic,
-        isCallThroughGetter,
         isInstantiatedInterfaceCall,
         isUncheckedCall,
         isUncheckedClosureCall;
@@ -3362,57 +3361,6 @@ class BytecodeGenerator extends RecursiveVisitor<Null> {
     }
   }
 
-  /// Generates bytecode for o.foo(a0, ..., aN) call where o.foo is a
-  /// field or getter.
-  void _genCallThroughGetter(MethodInvocation node, int totalArgCount) {
-    final arguments = node.arguments;
-    if (arguments.types.isNotEmpty) {
-      _genTypeArguments(arguments.types);
-    }
-
-    // Keep order of evaluation: o, a0, .., aN, o.foo, o.foo.call(a0, ..., aN).
-    final receiver = node.receiver;
-    _generateNode(receiver);
-    final receiverTemp = locals.tempIndexInFrame(node, tempIndex: 0);
-    final checkForNull =
-        node.interfaceTarget.enclosingClass != coreTypes.objectClass;
-    if (checkForNull) {
-      asm.emitStoreLocal(receiverTemp);
-    }
-
-    int count = 0;
-    for (var arg in arguments.positional) {
-      _generateNode(arg);
-      asm.emitPopLocal(locals.tempIndexInFrame(node, tempIndex: count + 1));
-      ++count;
-    }
-    for (var arg in arguments.named) {
-      _generateNode(arg.value);
-      asm.emitPopLocal(locals.tempIndexInFrame(node, tempIndex: count + 1));
-      ++count;
-    }
-
-    // Check receiver for null before calling getter to report
-    // correct noSuchMethod for method call.
-    if (checkForNull) {
-      asm.emitPush(receiverTemp);
-      asm.emitNullCheck(cp.addSelectorName(node.name, InvocationKind.method));
-    }
-
-    _genInstanceCall(null, InvocationKind.getter, node.interfaceTarget,
-        node.name, receiver, 1, objectTable.getArgDescHandle(1));
-
-    for (int i = 0; i < count; ++i) {
-      asm.emitPush(locals.tempIndexInFrame(node, tempIndex: i + 1));
-    }
-
-    final argDesc =
-        objectTable.getArgDescHandleByArguments(arguments, hasReceiver: true);
-
-    _genInstanceCall(node, InvocationKind.method, null, callName, null,
-        totalArgCount, argDesc);
-  }
-
   @override
   visitMethodInvocation(MethodInvocation node) {
     final directCall =
@@ -3443,10 +3391,10 @@ class BytecodeGenerator extends RecursiveVisitor<Null> {
     }
 
     final Member interfaceTarget = node.interfaceTarget;
-    if (isCallThroughGetter(interfaceTarget)) {
-      assert(directCall == null);
-      _genCallThroughGetter(node, totalArgCount);
-      return;
+    if (!(interfaceTarget == null ||
+        interfaceTarget is Procedure && !interfaceTarget.isGetter)) {
+      throw new UnsupportedOperationError(
+          'Unsupported MethodInvocation with interface target ${interfaceTarget.runtimeType} $interfaceTarget');
     }
 
     if (directCall != null && directCall.checkReceiverForNull) {
@@ -3559,6 +3507,10 @@ class BytecodeGenerator extends RecursiveVisitor<Null> {
             ..addAll(args.named.map((x) => x.value)));
       return;
     }
+    if (!(target is Procedure && !target.isGetter)) {
+      throw new UnsupportedOperationError(
+          'Unsupported SuperMethodInvocation with target ${target.runtimeType} $target');
+    }
     _genArguments(new ThisExpression(), args);
     _genDirectCallWithArgs(target, args,
         hasReceiver: true, isUnchecked: true, node: node);

pkg/vm/lib/bytecode/generics.dart

@@ -299,9 +299,3 @@ bool isUncheckedClosureCall(MethodInvocation node,
     node.name.name == 'call' &&
     getStaticType(node.receiver, staticTypeContext) is FunctionType &&
     !options.avoidClosureCallInstructions;
-
-/// Returns true if [MethodInvocation] node with given [interfaceTarget] is
-/// a call through field or getter.
-bool isCallThroughGetter(Member interfaceTarget) =>
-    interfaceTarget is Field ||
-    interfaceTarget is Procedure && interfaceTarget.isGetter;

pkg/vm/lib/bytecode/local_vars.dart

@@ -1301,9 +1301,6 @@ class _Allocator extends RecursiveVisitor<Null> {
     if (isUncheckedClosureCall(
         node, locals.staticTypeContext, locals.options)) {
       numTemps = 1;
-    } else if (isCallThroughGetter(node.interfaceTarget)) {
-      final args = node.arguments;
-      numTemps = 1 + args.positional.length + args.named.length;
     } else if (locals.directCallMetadata != null) {
       final directCall = locals.directCallMetadata[node];
       if (directCall != null && directCall.checkReceiverForNull) {

pkg/vm/lib/transformations/type_flow/summary_collector.dart

@@ -1581,29 +1581,14 @@ class SummaryCollector extends RecursiveVisitor<TypeExpr> {
       result = _makeCall(
           node, new DynamicSelector(CallKind.Method, node.name), args);
     } else {
-      // TODO(dartbug.com/34497): Once front-end desugars calls via
-      // fields/getters, handling of field and getter targets here
-      // can be turned into assertions.
-      if ((target is Field) || ((target is Procedure) && target.isGetter)) {
-        // Call via field/getter.
-        final value = _makeCall(
-            null,
-            (receiverNode is ThisExpression)
-                ? new VirtualSelector(target, callKind: CallKind.PropertyGet)
-                : new InterfaceSelector(target, callKind: CallKind.PropertyGet),
-            new Args<TypeExpr>([receiver]));
-        _makeCall(
-            null, DynamicSelector.kCall, new Args.withReceiver(args, value));
-        result = _staticType(node);
-      } else {
-        // TODO(alexmarkov): overloaded arithmetic operators
-        result = _makeCall(
-            node,
-            (node.receiver is ThisExpression)
-                ? new VirtualSelector(target)
-                : new InterfaceSelector(target),
-            args);
-      }
+      assertx(target is Procedure && !target.isGetter);
+      // TODO(alexmarkov): overloaded arithmetic operators
+      result = _makeCall(
+          node,
+          (node.receiver is ThisExpression)
+              ? new VirtualSelector(target)
+              : new InterfaceSelector(target),
+          args);
     }
     _updateReceiverAfterCall(receiverNode, receiver, node.name);
     return result;
@@ -1681,21 +1666,9 @@ class SummaryCollector extends RecursiveVisitor<TypeExpr> {
     if (target == null) {
       return const EmptyType();
     } else {
-      if ((target is Field) || ((target is Procedure) && target.isGetter)) {
-        // Call via field/getter.
-        // TODO(alexmarkov): Consider cleaning up this code as it duplicates
-        // processing in DirectInvocation.
-        final fieldValue = _makeCall(
-            node,
-            new DirectSelector(target, callKind: CallKind.PropertyGet),
-            new Args<TypeExpr>([_receiver]));
-        _makeCall(null, DynamicSelector.kCall,
-            new Args.withReceiver(args, fieldValue));
-        return _staticType(node);
-      } else {
-        _entryPointsListener.recordMemberCalledViaThis(target);
-        return _makeCall(node, new DirectSelector(target), args);
-      }
+      assertx(target is Procedure && !target.isGetter);
+      _entryPointsListener.recordMemberCalledViaThis(target);
+      return _makeCall(node, new DirectSelector(target), args);
     }
   }