diff --git a/runtime/observatory/lib/src/elements/helpers/any_ref.dart b/runtime/observatory/lib/src/elements/helpers/any_ref.dart index 222f40d4736..ac5e1e38443 100644 --- a/runtime/observatory/lib/src/elements/helpers/any_ref.dart +++ b/runtime/observatory/lib/src/elements/helpers/any_ref.dart @@ -93,8 +93,6 @@ Element anyRef(M.IsolateRef isolate, ref, M.ObjectRepository objects, } } else if (ref is M.Sentinel) { return new SentinelValueElement(ref, queue: queue).element; - } else if (ref is num || ref is String) { - return new SpanElement()..text = ref.toString(); } throw new Exception('Unknown ref type (${ref.runtimeType})'); } diff --git a/runtime/observatory/lib/src/elements/instance_ref.dart b/runtime/observatory/lib/src/elements/instance_ref.dart index 01ba0330212..819a499c99f 100644 --- a/runtime/observatory/lib/src/elements/instance_ref.dart +++ b/runtime/observatory/lib/src/elements/instance_ref.dart @@ -128,7 +128,6 @@ class InstanceRefElement extends CustomElement implements Renderable { case M.InstanceKind.functionType: case M.InstanceKind.typeRef: case M.InstanceKind.typeParameter: - case M.InstanceKind.recordType: return [ new AnchorElement(href: Uris.inspect(_isolate, object: _instance)) ..text = _instance.name @@ -195,10 +194,12 @@ class InstanceRefElement extends CustomElement implements Renderable { ] ]; case M.InstanceKind.mirrorReference: + return [ + new AnchorElement(href: Uris.inspect(_isolate, object: _instance)) + ..classes = ['emphasize'] + ..text = _instance.clazz!.name + ]; case M.InstanceKind.weakProperty: - case M.InstanceKind.finalizer: - case M.InstanceKind.weakReference: - case M.InstanceKind.record: return [ new AnchorElement(href: Uris.inspect(_isolate, object: _instance)) ..classes = ['emphasize'] @@ -215,7 +216,6 @@ class InstanceRefElement extends CustomElement implements Renderable { case M.InstanceKind.mirrorReference: case M.InstanceKind.stackTrace: case M.InstanceKind.weakProperty: - case M.InstanceKind.recordType: return true; case M.InstanceKind.list: case M.InstanceKind.map: @@ -339,18 +339,6 @@ class InstanceRefElement extends CustomElement implements Renderable { queue: _r.queue) .element, ]; - case M.InstanceKind.recordType: - final fields = _loadedInstance!.fields!.toList(); - return [ - for (int i = 0; i < fields.length; ++i) ...[ - new SpanElement()..text = '${fields[i].name} = ', - new InstanceRefElement( - _isolate, fields[i].value!.asValue!, _objects, - queue: _r.queue) - .element, - if (i + 1 != fields.length) new BRElement(), - ] - ]; default: return []; } diff --git a/runtime/observatory/lib/src/elements/instance_view.dart b/runtime/observatory/lib/src/elements/instance_view.dart index 4c4d69064a1..2063c281800 100644 --- a/runtime/observatory/lib/src/elements/instance_view.dart +++ b/runtime/observatory/lib/src/elements/instance_view.dart @@ -335,12 +335,9 @@ class InstanceViewElement extends CustomElement implements Renderable { ..content = [ new DivElement() ..classes = ['memberList'] - ..children = fields.map((f) { - final name = _instance.kind == M.InstanceKind.record - ? f.name - : f.decl; - return member(name, f.value); - }).toList() + ..children = fields + .map((f) => member(f.decl, f.value)) + .toList() ]) .element ] diff --git a/runtime/observatory/lib/src/models/objects/instance.dart b/runtime/observatory/lib/src/models/objects/instance.dart index 1b2d58e2271..81020959067 100644 --- a/runtime/observatory/lib/src/models/objects/instance.dart +++ b/runtime/observatory/lib/src/models/objects/instance.dart @@ -126,18 +126,6 @@ enum InstanceKind { /// An instance of the Dart class RawReceivePort receivePort, - - /// An instance of Record. - record, - - /// An instance of RecordType - recordType, - - /// An instance of Finalizer - finalizer, - - /// An instance of WeakReference - weakReference, } bool isTypedData(InstanceKind? kind) { @@ -475,8 +463,7 @@ abstract class Instance extends Object implements InstanceRef { abstract class BoundField { FieldRef? get decl; - Guarded? get value; - dynamic get name; + Guarded? get value; } abstract class NativeField { diff --git a/runtime/observatory/lib/src/service/object.dart b/runtime/observatory/lib/src/service/object.dart index 1a256a6ad08..c4af948dc1c 100644 --- a/runtime/observatory/lib/src/service/object.dart +++ b/runtime/observatory/lib/src/service/object.dart @@ -2108,7 +2108,7 @@ class ServiceMap extends ServiceObject _map.clear(); map.forEach((k, v) => _map[k] = v); - name = _map['name']?.toString(); + name = _map['name']; vmName = (_map.containsKey('_vmName') ? _map['_vmName'] : name); } @@ -2791,33 +2791,25 @@ M.InstanceKind stringToInstanceKind(String s) { return M.InstanceKind.typeRef; case 'ReceivePort': return M.InstanceKind.receivePort; - case '_RecordType': - return M.InstanceKind.recordType; - case '_Record': - return M.InstanceKind.record; - case 'Finalizer': - return M.InstanceKind.finalizer; - case 'WeakReference': - return M.InstanceKind.weakReference; } var message = 'Unrecognized instance kind: $s'; Logger.root.severe(message); throw new ArgumentError(message); } -class Guarded implements M.Guarded { +class Guarded implements M.Guarded { bool get isValue => asValue != null; bool get isSentinel => asSentinel != null; final Sentinel? asSentinel; final T? asValue; - factory Guarded(dynamic obj) { + factory Guarded(ServiceObject obj) { if (obj is Sentinel) { return new Guarded.fromSentinel(obj); } else if (obj is T) { return new Guarded.fromValue(obj); } - throw new Exception('${obj.runtimeType} is neither Sentinel or $T'); + throw new Exception('${obj.type} is neither Sentinel or $T'); } Guarded.fromSentinel(this.asSentinel) : asValue = null; @@ -2825,11 +2817,9 @@ class Guarded implements M.Guarded { } class BoundField implements M.BoundField { - final Field? decl; - // String|int - final dynamic name; - final Guarded value; - BoundField(this.decl, this.name, value) : value = new Guarded(value); + final Field decl; + final Guarded value; + BoundField(this.decl, value) : value = new Guarded(value); } class NativeField implements M.NativeField { @@ -2926,7 +2916,7 @@ class Instance extends HeapObject implements M.Instance { Instance._empty(ServiceObjectOwner? owner) : super._empty(owner); void _update(Map map, bool mapIsRef) { - // Extract full properties. + // Extract full properties.1 _upgradeCollection(map, isolate); super._update(map, mapIsRef); @@ -2935,7 +2925,7 @@ class Instance extends HeapObject implements M.Instance { // Coerce absence to false. valueAsStringIsTruncated = map['valueAsStringIsTruncated'] == true; closureFunction = map['closureFunction']; - name = map['name']?.toString(); + name = map['name']; length = map['length']; pattern = map['pattern']; typeClass = map['typeClass']; @@ -2968,7 +2958,7 @@ class Instance extends HeapObject implements M.Instance { if (map['fields'] != null) { var fields = []; for (var f in map['fields']) { - fields.add(new BoundField(f['decl'], f['name'], f['value'])); + fields.add(new BoundField(f['decl'], f['value'])); } this.fields = fields; } else { diff --git a/runtime/observatory/tests/ui/inspector.dart b/runtime/observatory/tests/ui/inspector.dart index eeb461f37b7..e8fc90a4a7f 100644 --- a/runtime/observatory/tests/ui/inspector.dart +++ b/runtime/observatory/tests/ui/inspector.dart @@ -2,8 +2,6 @@ // 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. -// @dart = 2.19 - // See inspector.txt for expected behavior. library manual_inspector_test; @@ -45,13 +43,10 @@ class Node { var blockCopying; var blockFull; var blockFullWithChain; - var blockType; var boundedType; var capability; var counter; var expando; - var finalizer; - var finalizerEntry; var float32x4; var float64; var float64x2; @@ -67,10 +62,7 @@ class Node { var mirrorReference; var portReceive; var portSend; - var record; - var recordType; var regex; - late var sentinel; // Not initialized var smi; var stacktrace; var string; @@ -84,12 +76,9 @@ class Node { var theTrue; var type; var typeParameter; - var typedDataArray; - var typedDataView; - var typedDataUnmodifiableView; + var typedData; var userTag; var weakProperty; - var weakReference; genStackTrace() { try { @@ -152,19 +141,16 @@ class Node { array[0] = 1; array[1] = 2; array[2] = 3; - bigint = BigInt.one << 65; + bigint = 1 << 65; blockClean = genCleanBlock(); blockCopying = genCopyingBlock(); blockFull = genFullBlock(); blockFullWithChain = genFullBlockWithChain(); - blockType = blockClean.runtimeType; boundedType = extractPrivateField( reflect(new B()).type.typeVariables.single, '_reflectee'); counter = new Counter("CounterName", "Counter description"); expando = new Expando("expando-name"); expando[array] = 'The weakly associated value'; - finalizer = Finalizer((_){}); - finalizer.attach(this, this); float32x4 = new Float32x4(0.0, -1.0, 3.14, 2e28); float64 = 3.14; float64x2 = new Float64x2(0.0, 3.14); @@ -184,8 +170,6 @@ class Node { mirrorReference = extractPrivateField(mirrorClass, '_reflectee'); portReceive = new RawReceivePort(); portSend = portReceive.sendPort; - record = (1, 2, three: 3, four: 4); - recordType = record.runtimeType; regex = new RegExp("a*b+c"); smi = 7; stacktrace = genStackTrace(); @@ -201,13 +185,10 @@ class Node { type = String; typeParameter = extractPrivateField(reflectClass(A).typeVariables.single, '_reflectee'); - typedDataArray = Uint8List(32); - typedDataView = Uint8List.view(typedDataArray.buffer, 16); - typedDataUnmodifiableView = UnmodifiableUint8ListView(typedDataArray); + typedData = extractPrivateField(new ByteData(64), '_typedData'); userTag = new UserTag("Example tag name"); weakProperty = extractPrivateField(expando, '_data').firstWhere((e) => e != null); - weakReference = WeakReference(this); Isolate.spawn(secondMain, "Hello2").then((otherIsolate) { isolate = otherIsolate; diff --git a/runtime/observatory/tests/ui/inspector_part.dart b/runtime/observatory/tests/ui/inspector_part.dart index 6222354a3ea..06589e319f8 100644 --- a/runtime/observatory/tests/ui/inspector_part.dart +++ b/runtime/observatory/tests/ui/inspector_part.dart @@ -2,8 +2,6 @@ // 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. -// @dart = 2.19 - part of manual_inspector_test; functionInPart() {} diff --git a/runtime/observatory_2/lib/src/elements/helpers/any_ref.dart b/runtime/observatory_2/lib/src/elements/helpers/any_ref.dart index a1f2d9617bc..0ae29302c3b 100644 --- a/runtime/observatory_2/lib/src/elements/helpers/any_ref.dart +++ b/runtime/observatory_2/lib/src/elements/helpers/any_ref.dart @@ -93,8 +93,6 @@ Element anyRef(M.IsolateRef isolate, ref, M.ObjectRepository objects, } } else if (ref is M.Sentinel) { return new SentinelValueElement(ref, queue: queue).element; - } else if (ref is num || ref is String) { - return new SpanElement()..text = ref.toString(); } throw new Exception('Unknown ref type (${ref.runtimeType})'); } diff --git a/runtime/observatory_2/lib/src/elements/instance_ref.dart b/runtime/observatory_2/lib/src/elements/instance_ref.dart index e98148e86f0..a4b3f9e33dc 100644 --- a/runtime/observatory_2/lib/src/elements/instance_ref.dart +++ b/runtime/observatory_2/lib/src/elements/instance_ref.dart @@ -127,7 +127,6 @@ class InstanceRefElement extends CustomElement implements Renderable { case M.InstanceKind.functionType: case M.InstanceKind.typeRef: case M.InstanceKind.typeParameter: - case M.InstanceKind.recordType: return [ new AnchorElement(href: Uris.inspect(_isolate, object: _instance)) ..text = _instance.name @@ -193,10 +192,12 @@ class InstanceRefElement extends CustomElement implements Renderable { ] ]; case M.InstanceKind.mirrorReference: + return [ + new AnchorElement(href: Uris.inspect(_isolate, object: _instance)) + ..classes = ['emphasize'] + ..text = _instance.clazz.name + ]; case M.InstanceKind.weakProperty: - case M.InstanceKind.finalizer: - case M.InstanceKind.weakReference: - case M.InstanceKind.record: return [ new AnchorElement(href: Uris.inspect(_isolate, object: _instance)) ..classes = ['emphasize'] @@ -213,7 +214,6 @@ class InstanceRefElement extends CustomElement implements Renderable { case M.InstanceKind.mirrorReference: case M.InstanceKind.stackTrace: case M.InstanceKind.weakProperty: - case M.InstanceKind.recordType: return true; case M.InstanceKind.list: case M.InstanceKind.map: @@ -337,17 +337,6 @@ class InstanceRefElement extends CustomElement implements Renderable { queue: _r.queue) .element, ]; - case M.InstanceKind.recordType: - final fields = _loadedInstance.fields.toList(); - return [ - for (int i = 0; i < fields.length; ++i) ...[ - new SpanElement()..text = '${fields[i].name} = ', - new InstanceRefElement(_isolate, fields[i].value.asValue, _objects, - queue: _r.queue) - .element, - if (i + 1 != fields.length) new BRElement(), - ] - ]; default: return []; } diff --git a/runtime/observatory_2/lib/src/elements/instance_view.dart b/runtime/observatory_2/lib/src/elements/instance_view.dart index 592a978a1a1..fcc18125c78 100644 --- a/runtime/observatory_2/lib/src/elements/instance_view.dart +++ b/runtime/observatory_2/lib/src/elements/instance_view.dart @@ -334,12 +334,9 @@ class InstanceViewElement extends CustomElement implements Renderable { ..content = [ new DivElement() ..classes = ['memberList'] - ..children = fields.map((f) { - final name = _instance.kind == M.InstanceKind.record - ? f.name - : f.decl; - return member(name, f.value); - }).toList() + ..children = fields + .map((f) => member(f.decl, f.value)) + .toList() ]) .element ] diff --git a/runtime/observatory_2/lib/src/models/objects/instance.dart b/runtime/observatory_2/lib/src/models/objects/instance.dart index ff914bc5840..b21c572a942 100644 --- a/runtime/observatory_2/lib/src/models/objects/instance.dart +++ b/runtime/observatory_2/lib/src/models/objects/instance.dart @@ -126,18 +126,6 @@ enum InstanceKind { /// An instance of the Dart class RawReceivePort receivePort, - - /// An instance of Record. - record, - - /// An instance of RecordType - recordType, - - /// An instance of Finalizer - finalizer, - - /// An instance of WeakReference - weakReference, } bool isTypedData(InstanceKind kind) { @@ -466,8 +454,7 @@ abstract class Instance extends Object implements InstanceRef { abstract class BoundField { FieldRef get decl; - dynamic get name; - Guarded get value; + Guarded get value; } abstract class NativeField { diff --git a/runtime/observatory_2/lib/src/service/object.dart b/runtime/observatory_2/lib/src/service/object.dart index bfe5b05d3af..5c9f6df4967 100644 --- a/runtime/observatory_2/lib/src/service/object.dart +++ b/runtime/observatory_2/lib/src/service/object.dart @@ -2118,7 +2118,7 @@ class ServiceMap extends ServiceObject _map.clear(); _map.addAll(map); - name = _map['name']?.toString(); + name = _map['name']; vmName = (_map.containsKey('_vmName') ? _map['_vmName'] : name); } @@ -2800,33 +2800,25 @@ M.InstanceKind stringToInstanceKind(String s) { return M.InstanceKind.typeRef; case 'ReceivePort': return M.InstanceKind.receivePort; - case '_Record': - return M.InstanceKind.record; - case '_RecordType': - return M.InstanceKind.recordType; - case 'Finalizer': - return M.InstanceKind.finalizer; - case 'WeakReference': - return M.InstanceKind.weakReference; } var message = 'Unrecognized instance kind: $s'; Logger.root.severe(message); throw new ArgumentError(message); } -class Guarded implements M.Guarded { +class Guarded implements M.Guarded { bool get isValue => asValue != null; bool get isSentinel => asSentinel != null; final Sentinel asSentinel; final T asValue; - factory Guarded(dynamic obj) { + factory Guarded(ServiceObject obj) { if (obj is Sentinel) { return new Guarded.fromSentinel(obj); } else if (obj is T) { return new Guarded.fromValue(obj); } - throw new Exception('${obj.runtimeType} is neither Sentinel or $T'); + throw new Exception('${obj.type} is neither Sentinel or $T'); } Guarded.fromSentinel(this.asSentinel) : asValue = null; @@ -2835,10 +2827,8 @@ class Guarded implements M.Guarded { class BoundField implements M.BoundField { final Field decl; - // String|int - final dynamic name; - final Guarded value; - BoundField(this.decl, this.name, value) : value = new Guarded(value); + final Guarded value; + BoundField(this.decl, value) : value = new Guarded(value); } class NativeField implements M.NativeField { @@ -2939,7 +2929,7 @@ class Instance extends HeapObject implements M.Instance { Instance._empty(ServiceObjectOwner owner) : super._empty(owner); void _update(Map map, bool mapIsRef) { - // Extract full properties. + // Extract full properties.1 _upgradeCollection(map, isolate); super._update(map, mapIsRef); @@ -2948,7 +2938,7 @@ class Instance extends HeapObject implements M.Instance { // Coerce absence to false. valueAsStringIsTruncated = map['valueAsStringIsTruncated'] == true; closureFunction = map['closureFunction']; - name = map['name']?.toString(); + name = map['name']; length = map['length']; pattern = map['pattern']; typeClass = map['typeClass']; @@ -2981,7 +2971,7 @@ class Instance extends HeapObject implements M.Instance { if (map['fields'] != null) { var fields = []; for (var f in map['fields']) { - fields.add(new BoundField(f['decl'], f['name'], f['value'])); + fields.add(new BoundField(f['decl'], f['value'])); } this.fields = fields; } else { diff --git a/runtime/vm/object_service.cc b/runtime/vm/object_service.cc index b33d27922ee..053c1c7a66b 100644 --- a/runtime/vm/object_service.cc +++ b/runtime/vm/object_service.cc @@ -1128,7 +1128,7 @@ void Instance::PrintSharedInstanceJSON(JSONObject* jsobj, Array& field_array = Array::Handle(); Field& field = Field::Handle(); - Object& field_value = Object::Handle(); + Instance& field_value = Instance::Handle(); { JSONArray jsarr(jsobj, "fields"); for (intptr_t i = classes.length() - 1; i >= 0; i--) { @@ -1137,7 +1137,7 @@ void Instance::PrintSharedInstanceJSON(JSONObject* jsobj, for (intptr_t j = 0; j < field_array.Length(); j++) { field ^= field_array.At(j); if (!field.is_static()) { - field_value = GetField(field); + field_value ^= GetField(field); JSONObject jsfield(&jsarr); jsfield.AddProperty("type", "BoundField"); jsfield.AddProperty("decl", field);