Revert "Reland "[ VM / Service ] Add abstract flag to Function""

This reverts commit aa2e198.

Reason for revert: broken g3 bot

Original change's description:
> Reland "[ VM / Service ] Add abstract flag to Function"
>
> This reverts commit 6c542ec.
>
> Switched vm_service from a minor version bump to a major one.
> See: https://buganizer.corp.google.com/issues/236964692#comment4
>
> Bug: dart-lang/coverage#398
> Change-Id: I85f88d4a1cdcb878cbf77da283041458381e2a2b
> TEST=Added to get_object_rpc_test.dart
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/250772
> Commit-Queue: Liam Appelbe <liama@google.com>
> Reviewed-by: Siva Annamalai <asiva@google.com>

TBR=bkonyi@google.com,asiva@google.com,liama@google.com

Change-Id: I6fbedfb146ee2157baf49162acd0c943402b6cbf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: dart-lang/coverage#398
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/250787
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>

pkg/vm_service/CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## 10.0.0
-- Update to version `3.59` of the spec.
-- Add `abstract` flag to `FuncRef`.
-
 ## 9.0.0
 - Update to version `3.58` of the spec.
 - Added optional `local` parameter to `lookupResolvedPackageUris` RPC.

pkg/vm_service/java/version.properties

@@ -1 +1 @@
-version=3.59
+version=3.58

pkg/vm_service/lib/src/vm_service.dart

@@ -26,7 +26,7 @@ export 'snapshot_graph.dart'
         HeapSnapshotObjectNoData,
         HeapSnapshotObjectNullData;
 
-const String vmServiceVersion = '3.59.0';
+const String vmServiceVersion = '3.58.0';
 
 /// @optional
 const String optional = 'optional';
@@ -4675,9 +4675,6 @@ class FuncRef extends ObjRef {
   /// Is this function implicitly defined (e.g., implicit getter/setter)?
   bool? implicit;
 
-  /// Is this function an abstract method?
-  bool? isAbstract;
-
   /// The location of this function in the source code.
   ///
   /// Note: this may not agree with the location of `owner` if this is a
@@ -4692,7 +4689,6 @@ class FuncRef extends ObjRef {
     required this.isStatic,
     required this.isConst,
     required this.implicit,
-    required this.isAbstract,
     required String id,
     this.location,
   }) : super(
@@ -4706,7 +4702,6 @@ class FuncRef extends ObjRef {
     isStatic = json['static'] ?? false;
     isConst = json['const'] ?? false;
     implicit = json['implicit'] ?? false;
-    isAbstract = json['abstract'] ?? false;
     location = createServiceObject(json['location'], const ['SourceLocation'])
         as SourceLocation?;
   }
@@ -4724,7 +4719,6 @@ class FuncRef extends ObjRef {
       'static': isStatic,
       'const': isConst,
       'implicit': implicit,
-      'abstract': isAbstract,
     });
     _setIfNotNull(json, 'location', location?.toJson());
     return json;
@@ -4736,7 +4730,7 @@ class FuncRef extends ObjRef {
 
   String toString() => '[FuncRef ' //
       'id: ${id}, name: ${name}, owner: ${owner}, isStatic: ${isStatic}, ' //
-      'isConst: ${isConst}, implicit: ${implicit}, isAbstract: ${isAbstract}]';
+      'isConst: ${isConst}, implicit: ${implicit}]';
 }
 
 /// A `Func` represents a Dart language function.
@@ -4765,9 +4759,6 @@ class Func extends Obj implements FuncRef {
   /// Is this function implicitly defined (e.g., implicit getter/setter)?
   bool? implicit;
 
-  /// Is this function an abstract method?
-  bool? isAbstract;
-
   /// The location of this function in the source code.
   ///
   /// Note: this may not agree with the location of `owner` if this is a
@@ -4789,7 +4780,6 @@ class Func extends Obj implements FuncRef {
     required this.isStatic,
     required this.isConst,
     required this.implicit,
-    required this.isAbstract,
     required this.signature,
     required String id,
     this.location,
@@ -4805,7 +4795,6 @@ class Func extends Obj implements FuncRef {
     isStatic = json['static'] ?? false;
     isConst = json['const'] ?? false;
     implicit = json['implicit'] ?? false;
-    isAbstract = json['abstract'] ?? false;
     location = createServiceObject(json['location'], const ['SourceLocation'])
         as SourceLocation?;
     signature = createServiceObject(json['signature'], const ['InstanceRef'])
@@ -4826,7 +4815,6 @@ class Func extends Obj implements FuncRef {
       'static': isStatic,
       'const': isConst,
       'implicit': implicit,
-      'abstract': isAbstract,
       'signature': signature?.toJson(),
     });
     _setIfNotNull(json, 'location', location?.toJson());
@@ -4840,7 +4828,7 @@ class Func extends Obj implements FuncRef {
 
   String toString() => '[Func ' //
       'id: ${id}, name: ${name}, owner: ${owner}, isStatic: ${isStatic}, ' //
-      'isConst: ${isConst}, implicit: ${implicit}, isAbstract: ${isAbstract}, signature: ${signature}]';
+      'isConst: ${isConst}, implicit: ${implicit}, signature: ${signature}]';
 }
 
 /// `InstanceRef` is a reference to an `Instance`.
@@ -6334,9 +6322,7 @@ class LogRecord extends Response {
     return json;
   }
 
-  String toString() => '[LogRecord ' //
-      'message: ${message}, time: ${time}, level: ${level}, sequenceNumber: ${sequenceNumber}, ' //
-      'loggerName: ${loggerName}, zone: ${zone}, error: ${error}, stackTrace: ${stackTrace}]';
+  String toString() => '[LogRecord]';
 }
 
 class MapAssociation {

pkg/vm_service/pubspec.yaml

@@ -1,5 +1,5 @@
 name: vm_service
-version: 10.0.0
+version: 9.0.0
 description: >-
   A library to communicate with a service implementing the Dart VM
   service protocol.

pkg/vm_service/tool/dart/generate_dart.dart

@@ -1611,8 +1611,7 @@ Map<String, dynamic> toJson() {
     // toString()
     Iterable<TypeField> toStringFields =
         getAllFields().where((f) => !f.optional);
-    const maxFieldsShownInToString = 8;
-    if (toStringFields.length <= maxFieldsShownInToString) {
+    if (toStringFields.length <= 7) {
       String properties = toStringFields
           .map(
               (TypeField f) => "${f.generatableName}: \${${f.generatableName}}")

runtime/observatory/tests/service/get_object_rpc_test.dart

@@ -11,17 +11,12 @@ import 'package:test/test.dart';
 import 'service_test_common.dart';
 import 'test_helper.dart';
 
-abstract class _DummyAbstractBaseClass {
-  void dummyFunction(int a, [bool b = false]);
-}
-
-class _DummyClass extends _DummyAbstractBaseClass {
+class _DummyClass {
   static var dummyVar = 11;
   final List<String> dummyList = new List<String>.filled(20, '');
   static var dummyVarWithInit = foo();
   late String dummyLateVarWithInit = 'bar';
   late String dummyLateVar;
-  @override
   void dummyFunction(int a, [bool b = false]) {}
   void dummyGenericFunction<K, V>(K a, {required V param}) {}
   static List foo() => List<String>.filled(20, '');
@@ -894,7 +889,6 @@ var tests = <IsolateTest>[
     expect(result['static'], equals(false));
     expect(result['const'], equals(false));
     expect(result['implicit'], equals(false));
-    expect(result['abstract'], equals(false));
     expect(result['signature']['typeParameters'], isNull);
     expect(result['signature']['returnType'], isNotNull);
     expect(result['signature']['parameters'].length, 3);
@@ -929,7 +923,6 @@ var tests = <IsolateTest>[
     expect(result['static'], equals(false));
     expect(result['const'], equals(false));
     expect(result['implicit'], equals(false));
-    expect(result['abstract'], equals(false));
     expect(result['signature']['typeParameters'].length, 2);
     expect(result['signature']['returnType'], isNotNull);
     expect(result['signature']['parameters'].length, 3);
@@ -950,60 +943,6 @@ var tests = <IsolateTest>[
     expect(result['_deoptimizations'], isZero);
   },
 
-  // abstract function.
-  (Isolate isolate) async {
-    // Call eval to get a class id.
-    var evalResult = await invoke(isolate, 'getDummyClass');
-    var result = await isolate.invokeRpcNoUpgrade('getObject', {
-      'objectId': evalResult['class']['id'],
-    });
-    expect(result['type'], equals('Class'));
-    expect(result['id'], startsWith('classes/'));
-    expect(result['name'], equals('_DummyClass'));
-    expect(result['abstract'], equals(false));
-
-    // Get the super class.
-    var superClass = await isolate.invokeRpcNoUpgrade('getObject', {
-      'objectId': result['super']['id'],
-    });
-    expect(superClass['type'], equals('Class'));
-    expect(superClass['id'], startsWith('classes/'));
-    expect(superClass['name'], equals('_DummyAbstractBaseClass'));
-    expect(superClass['abstract'], equals(true));
-
-    // Find the abstract dummyFunction on the super class.
-    var funcId = superClass['functions']
-        .firstWhere((f) => f['name'] == 'dummyFunction')['id'];
-    var funcResult = await isolate.invokeRpcNoUpgrade('getObject', {
-      'objectId': funcId,
-    });
-
-    expect(funcResult['type'], equals('Function'));
-    expect(funcResult['id'], equals(funcId));
-    expect(funcResult['name'], equals('dummyFunction'));
-    expect(funcResult['_kind'], equals('RegularFunction'));
-    expect(funcResult['static'], equals(false));
-    expect(funcResult['const'], equals(false));
-    expect(funcResult['implicit'], equals(false));
-    expect(funcResult['abstract'], equals(true));
-    expect(funcResult['signature']['typeParameters'], isNull);
-    expect(funcResult['signature']['returnType'], isNotNull);
-    expect(funcResult['signature']['parameters'].length, 3);
-    expect(funcResult['signature']['parameters'][1]['parameterType']['name'],
-        equals('int'));
-    expect(funcResult['signature']['parameters'][1]['fixed'], isTrue);
-    expect(funcResult['signature']['parameters'][2]['parameterType']['name'],
-        equals('bool'));
-    expect(funcResult['signature']['parameters'][2]['fixed'], isFalse);
-    expect(funcResult['location']['type'], equals('SourceLocation'));
-    expect(funcResult['code']['type'], equals('@Code'));
-    expect(funcResult['_optimizable'], equals(true));
-    expect(funcResult['_inlinable'], equals(true));
-    expect(funcResult['_usageCounter'], isZero);
-    expect(funcResult['_optimizedCallSiteCount'], isZero);
-    expect(funcResult['_deoptimizations'], isZero);
-  },
-
   // invalid function.
   (Isolate isolate) async {
     // Call eval to get a class id.
@@ -1063,7 +1002,6 @@ var tests = <IsolateTest>[
     expect(result['static'], equals(true));
     expect(result['const'], equals(false));
     expect(result['implicit'], equals(false));
-    expect(result['abstract'], equals(false));
     expect(result['signature']['typeParameters'], isNull);
     expect(result['signature']['returnType'], isNotNull);
     expect(result['signature']['parameters'].length, 0);
@@ -1092,7 +1030,6 @@ var tests = <IsolateTest>[
     expect(result['static'], equals(false));
     expect(result['const'], equals(false));
     expect(result['implicit'], equals(false));
-    expect(result['abstract'], equals(false));
     expect(result['signature']['typeParameters'], isNull);
     expect(result['signature']['returnType'], isNotNull);
     expect(result['signature']['parameters'].length, 1);

runtime/observatory/tests/service/get_version_rpc_test.dart

@@ -12,7 +12,7 @@ var tests = <VMTest>[
     final result = await vm.invokeRpcNoUpgrade('getVersion', {});
     expect(result['type'], 'Version');
     expect(result['major'], 3);
-    expect(result['minor'], 59);
+    expect(result['minor'], 57);
     expect(result['_privateMajor'], 0);
     expect(result['_privateMinor'], 0);
   },

runtime/observatory_2/tests/service_2/get_object_rpc_test.dart

@@ -11,15 +11,10 @@ import 'package:test/test.dart';
 import 'service_test_common.dart';
 import 'test_helper.dart';
 
-abstract class _DummyAbstractBaseClass {
-  void dummyFunction(int a, [bool b = false]);
-}
-
-class _DummyClass extends _DummyAbstractBaseClass {
+class _DummyClass {
   static var dummyVar = 11;
   final List<String> dummyList = new List<String>.filled(20, null);
   static var dummyVarWithInit = foo();
-  @override
   void dummyFunction(int a, [bool b = false]) {}
   void dummyGenericFunction<K, V>(K a, {V param}) {}
   static List foo() => List<String>.filled(20, '');
@@ -891,7 +886,6 @@ var tests = <IsolateTest>[
     expect(result['static'], equals(false));
     expect(result['const'], equals(false));
     expect(result['implicit'], equals(false));
-    expect(result['abstract'], equals(false));
     expect(result['signature']['typeParameters'], isNull);
     expect(result['signature']['returnType'], isNotNull);
     expect(result['signature']['parameters'].length, 3);
@@ -926,7 +920,6 @@ var tests = <IsolateTest>[
     expect(result['static'], equals(false));
     expect(result['const'], equals(false));
     expect(result['implicit'], equals(false));
-    expect(result['abstract'], equals(false));
     expect(result['signature']['typeParameters'].length, 2);
     expect(result['signature']['returnType'], isNotNull);
     expect(result['signature']['parameters'].length, 3);
@@ -947,60 +940,6 @@ var tests = <IsolateTest>[
     expect(result['_deoptimizations'], isZero);
   },
 
-  // abstract function.
-  (Isolate isolate) async {
-    // Call eval to get a class id.
-    var evalResult = await invoke(isolate, 'getDummyClass');
-    var result = await isolate.invokeRpcNoUpgrade('getObject', {
-      'objectId': evalResult['class']['id'],
-    });
-    expect(result['type'], equals('Class'));
-    expect(result['id'], startsWith('classes/'));
-    expect(result['name'], equals('_DummyClass'));
-    expect(result['abstract'], equals(false));
-
-    // Get the super class.
-    var superClass = await isolate.invokeRpcNoUpgrade('getObject', {
-      'objectId': result['super']['id'],
-    });
-    expect(superClass['type'], equals('Class'));
-    expect(superClass['id'], startsWith('classes/'));
-    expect(superClass['name'], equals('_DummyAbstractBaseClass'));
-    expect(superClass['abstract'], equals(true));
-
-    // Find the abstract dummyFunction on the super class.
-    var funcId = superClass['functions']
-        .firstWhere((f) => f['name'] == 'dummyFunction')['id'];
-    var funcResult = await isolate.invokeRpcNoUpgrade('getObject', {
-      'objectId': funcId,
-    });
-
-    expect(funcResult['type'], equals('Function'));
-    expect(funcResult['id'], equals(funcId));
-    expect(funcResult['name'], equals('dummyFunction'));
-    expect(funcResult['_kind'], equals('RegularFunction'));
-    expect(funcResult['static'], equals(false));
-    expect(funcResult['const'], equals(false));
-    expect(funcResult['implicit'], equals(false));
-    expect(funcResult['abstract'], equals(true));
-    expect(funcResult['signature']['typeParameters'], isNull);
-    expect(funcResult['signature']['returnType'], isNotNull);
-    expect(funcResult['signature']['parameters'].length, 3);
-    expect(funcResult['signature']['parameters'][1]['parameterType']['name'],
-        equals('int'));
-    expect(funcResult['signature']['parameters'][1]['fixed'], isTrue);
-    expect(funcResult['signature']['parameters'][2]['parameterType']['name'],
-        equals('bool'));
-    expect(funcResult['signature']['parameters'][2]['fixed'], isFalse);
-    expect(funcResult['location']['type'], equals('SourceLocation'));
-    expect(funcResult['code']['type'], equals('@Code'));
-    expect(funcResult['_optimizable'], equals(true));
-    expect(funcResult['_inlinable'], equals(true));
-    expect(funcResult['_usageCounter'], isZero);
-    expect(funcResult['_optimizedCallSiteCount'], isZero);
-    expect(funcResult['_deoptimizations'], isZero);
-  },
-
   // invalid function.
   (Isolate isolate) async {
     // Call eval to get a class id.
@@ -1093,7 +1032,6 @@ var tests = <IsolateTest>[
     expect(result['static'], equals(true));
     expect(result['const'], equals(false));
     expect(result['implicit'], equals(false));
-    expect(result['abstract'], equals(false));
     expect(result['signature']['typeParameters'], isNull);
     expect(result['signature']['returnType'], isNotNull);
     expect(result['signature']['parameters'].length, 0);

runtime/observatory_2/tests/service_2/get_version_rpc_test.dart

@@ -12,7 +12,7 @@ var tests = <VMTest>[
     final result = await vm.invokeRpcNoUpgrade('getVersion', {});
     expect(result['type'], equals('Version'));
     expect(result['major'], equals(3));
-    expect(result['minor'], equals(59));
+    expect(result['minor'], equals(57));
     expect(result['_privateMajor'], equals(0));
     expect(result['_privateMinor'], equals(0));
   },

runtime/vm/object_service.cc

@@ -341,7 +341,6 @@ void Function::PrintJSONImpl(JSONStream* stream, bool ref) const {
   jsobj.AddProperty("static", is_static());
   jsobj.AddProperty("const", is_const());
   jsobj.AddProperty("implicit", IsImplicitGetterOrSetter());
-  jsobj.AddProperty("abstract", is_abstract());
   jsobj.AddProperty("_intrinsic", is_intrinsic());
   jsobj.AddProperty("_native", is_native());
 

runtime/vm/object_test.cc

@@ -5890,7 +5890,7 @@ ISOLATE_UNIT_TEST_CASE(PrintJSONPrimitives) {
         "\"library\":{\"type\":\"@Library\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"dart.core\",\"uri\":\"dart:core\"}},"
         "\"_kind\":\"RegularFunction\",\"static\":false,\"const\":false,"
-        "\"implicit\":false,\"abstract\":false,"
+        "\"implicit\":false,"
         "\"_intrinsic\":false,\"_native\":false,"
         "\"location\":{\"type\":\"SourceLocation\","
         "\"script\":{\"type\":\"@Script\",\"fixedId\":true,\"id\":\"\","

runtime/vm/service.h

@@ -17,7 +17,7 @@
 namespace dart {
 
 #define SERVICE_PROTOCOL_MAJOR_VERSION 3
-#define SERVICE_PROTOCOL_MINOR_VERSION 59
+#define SERVICE_PROTOCOL_MINOR_VERSION 57
 
 class Array;
 class EmbedderServiceHandler;