From a5ce342250471a7c0afc433c68fe95c87d67a7c3 Mon Sep 17 00:00:00 2001 From: Daco Harkes Date: Mon, 16 Feb 2026 22:20:43 -0800 Subject: [PATCH] [deps] Roll dart-lang/native TEST=pkg/compiler/test/record_use/record_use_test.dart TEST=pkg/dart2wasm/test/record_use_test.dart TEST=pkg/vm/test/transformations/record_use_test.dart Bug: https://github.com/dart-lang/native/issues/2888 Change-Id: I13479fbb5ac637d1e9f496d19e838fb58c97d258 Cq-Include-Trybots: luci.dart.try:dart2wasm-asserts-linux-chrome-try,dart2wasm-asserts-minified-linux-d8-try,dart2wasm-linux-chrome-try,dart2wasm-linux-d8-try,dart2wasm-linux-firefox-try,dart2wasm-linux-jscm-chrome-try,dart2wasm-linux-optimized-jsc-try,pkg-linux-debug-try,pkg-linux-release-arm64-try,pkg-linux-release-try,pkg-mac-release-arm64-try,pkg-mac-release-try,pkg-win-release-arm64-try,pkg-win-release-try,dart2js-canary-linux-try,dart2js-hostasserts-linux-d8-try,dart2js-linux-chrome-try,dart2js-linux-firefox-try,dart2js-mac-chrome-try,dart2js-mac-safari-try,dart2js-minified-csp-linux-chrome-try,dart2js-minified-linux-d8-try,dart2js-unit-linux-x64-release-try,dart2js-win-chrome-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/480980 Reviewed-by: Nate Biggs Commit-Queue: Daco Harkes Auto-Submit: Daco Harkes --- DEPS | 2 +- .../src/js_emitter/record_use_emitter.dart | 14 ++++------- .../data/lib/js_interop.dart.json.expect | 8 +++++-- .../test/native_assets/compile_test.dart | 9 ++++--- .../record_use/record_call.dart | 9 ++++--- .../record_use/record_instance.dart | 2 +- .../record_use/lib/basic.dart.json.expect | 12 +++++++--- .../record_use/lib/complex.dart.json.expect | 12 +++++++--- .../const_argument_instance.dart.json.expect | 8 +++++-- .../lib/enum_const_arg.dart.json.expect | 8 +++++-- .../record_use/lib/extension.dart.json.expect | 8 +++++-- .../lib/instance_class.dart.json.expect | 8 +++++-- .../lib/instance_complex.dart.json.expect | 8 +++++-- .../lib/instance_duplicates.dart.json.expect | 8 +++++-- .../instance_not_annotation.dart.json.expect | 8 +++++-- .../loading_units_multiple.dart.json.expect | 12 +++++++--- .../lib/loading_units_simple.dart.json.expect | 24 ++++++++++++++----- .../lib/map_complex_keys.dart.json.expect | 12 +++++++--- .../lib/named_and_positional.dart.json.expect | 12 +++++++--- .../lib/named_both.dart.json.expect | 12 +++++++--- .../lib/named_optional.dart.json.expect | 12 +++++++--- .../lib/named_required.dart.json.expect | 12 +++++++--- .../named_with_function_arg.dart.json.expect | 8 +++++-- .../record_use/lib/nested.dart.json.expect | 16 +++++++++---- .../nested_instance_constant.dart.json.expect | 8 +++++-- .../lib/partfile_main.dart.json.expect | 12 +++++++--- .../lib/positional_both.dart.json.expect | 12 +++++++--- ...l_both_with_type_argument.dart.json.expect | 12 +++++++--- .../lib/positional_optional.dart.json.expect | 12 +++++++--- .../lib/record_enum.dart.json.expect | 8 +++++-- ...d_instance_constant_empty.dart.json.expect | 8 +++++-- .../record_use/lib/simple.dart.json.expect | 12 +++++++--- .../record_use/lib/tearoff.dart.json.expect | 12 +++++++--- .../lib/top_level_method.dart.json.expect | 8 +++++-- .../lib/types_of_arguments.dart.json.expect | 12 +++++++--- .../unsupported_collections.dart.json.expect | 8 +++++-- .../lib/unsupported_instance.dart.json.expect | 16 +++++++++---- 37 files changed, 276 insertions(+), 108 deletions(-) diff --git a/DEPS b/DEPS index 09453615df7..c1099e05d05 100644 --- a/DEPS +++ b/DEPS @@ -145,7 +145,7 @@ vars = { "i18n_rev": "dd8a792a8492370a594706c8304d2eb8db844d7a", "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e", - "native_rev": "cc90d34518c8462c0867fc6d1177028e474157ef", # rolled manually while record_use is experimental + "native_rev": "14169ab6e648cc06c4086facbb8e23b46b9fb35e", # rolled manually while record_use is experimental "protobuf_rev": "9e30258e0aa6a6430ee36c84b75308a9702fde42", "pub_rev": "26c6985c742593d081f8b58450f463a584a4203a", # rolled manually "shelf_rev": "dd830a0338b31bee92fe7ebc20b9bb963403b6b0", diff --git a/pkg/compiler/lib/src/js_emitter/record_use_emitter.dart b/pkg/compiler/lib/src/js_emitter/record_use_emitter.dart index 0cd871f2e8c..7634519fb07 100644 --- a/pkg/compiler/lib/src/js_emitter/record_use_emitter.dart +++ b/pkg/compiler/lib/src/js_emitter/record_use_emitter.dart @@ -83,20 +83,16 @@ class RecordUseCollector { ), calls: callMap.map( (key, value) => MapEntry( - Definition( - name: key.name!, - scope: key.enclosingClass?.name, - importUri: key.library.canonicalUri.toString(), - ), + Definition(key.library.canonicalUri.toString(), [ + if (key.enclosingClass?.name != null) Name(key.enclosingClass!.name), + Name(key.name!), + ]), value, ), ), instances: instanceMap.map((key, value) { return MapEntry( - Definition( - importUri: key.library.canonicalUri.toString(), - name: key.name, - ), + Definition(key.library.canonicalUri.toString(), [Name(key.name)]), value, ); }), diff --git a/pkg/compiler/test/record_use/data/lib/js_interop.dart.json.expect b/pkg/compiler/test/record_use/data/lib/js_interop.dart.json.expect index ef494856255..1b3fe30f9b6 100644 --- a/pkg/compiler/test/record_use/data/lib/js_interop.dart.json.expect +++ b/pkg/compiler/test/record_use/data/lib/js_interop.dart.json.expect @@ -29,8 +29,12 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someExternalFunction", + "definition": { + "path": [ + { + "name": "someExternalFunction" + } + ], "uri": "package:record_use_js_test/js_interop.dart" } } diff --git a/pkg/dartdev/test/native_assets/compile_test.dart b/pkg/dartdev/test/native_assets/compile_test.dart index 75f94fa65c0..c6f7b82be96 100644 --- a/pkg/dartdev/test/native_assets/compile_test.dart +++ b/pkg/dartdev/test/native_assets/compile_test.dart @@ -132,9 +132,8 @@ void main() async { final actualRecordedUsages = recordedUsages.readAsStringSync(); final u = RecordedUsages.fromJson(jsonDecode(actualRecordedUsages)); final constArguments = u.constArgumentsFor(Definition( - importUri: 'package:drop_data_asset/src/drop_data_asset.dart', - scope: 'MyMath', - name: 'add', + 'package:drop_data_asset/src/drop_data_asset.dart', + [Name('MyMath'), Name('add')], )); expect(constArguments.length, 1); expect(constArguments.first.named.isEmpty, true); @@ -176,8 +175,8 @@ void main() async { final actualRecordedUsages = recordedUsages.readAsStringSync(); final u = RecordedUsages.fromJson(jsonDecode(actualRecordedUsages)); final constantsOf = u.constantsOf(Definition( - importUri: 'package:drop_data_asset/src/drop_data_asset.dart', - name: 'RecordCallToC', + 'package:drop_data_asset/src/drop_data_asset.dart', + [Name('RecordCallToC')], )); expect(constantsOf.length, 0); }); diff --git a/pkg/vm/lib/transformations/record_use/record_call.dart b/pkg/vm/lib/transformations/record_use/record_call.dart index f97406b471c..195f050af16 100644 --- a/pkg/vm/lib/transformations/record_use/record_call.dart +++ b/pkg/vm/lib/transformations/record_use/record_call.dart @@ -125,10 +125,9 @@ class CallRecorder { final enclosingLibrary = target.enclosingLibrary; final importUri = enclosingLibrary.importUri.toString(); - return Definition( - importUri: importUri, - scope: target.enclosingClass?.name, - name: target.name.text, - ); + return Definition(importUri, [ + if (target.enclosingClass?.name != null) Name(target.enclosingClass!.name), + Name(target.name.text), + ]); } } diff --git a/pkg/vm/lib/transformations/record_use/record_instance.dart b/pkg/vm/lib/transformations/record_use/record_instance.dart index 5c35829e065..26764205b65 100644 --- a/pkg/vm/lib/transformations/record_use/record_instance.dart +++ b/pkg/vm/lib/transformations/record_use/record_instance.dart @@ -55,7 +55,7 @@ class InstanceRecorder { final enclosingLibrary = cls.enclosingLibrary; final importUri = enclosingLibrary.importUri.toString(); - return Definition(importUri: importUri, name: cls.name); + return Definition(importUri, [Name(cls.name)]); } InstanceReference _createInstanceReference( diff --git a/pkg/vm/testcases/transformations/record_use/lib/basic.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/basic.dart.json.expect index 42c262ab753..705c69f232b 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/basic.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/basic.dart.json.expect @@ -20,9 +20,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod2", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod2" + } + ], "uri": "package:record_use_test/basic.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/complex.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/complex.dart.json.expect index 50fe69519c4..fab45c191e8 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/complex.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/complex.dart.json.expect @@ -24,9 +24,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "generate", - "scope": "OtherClass", + "definition": { + "path": [ + { + "name": "OtherClass" + }, + { + "name": "generate" + } + ], "uri": "package:record_use_test/complex.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/const_argument_instance.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/const_argument_instance.dart.json.expect index 41a7475a5b3..dd3cc05f9de 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/const_argument_instance.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/const_argument_instance.dart.json.expect @@ -26,8 +26,12 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod2", + "definition": { + "path": [ + { + "name": "someStaticMethod2" + } + ], "uri": "package:record_use_test/const_argument_instance.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/enum_const_arg.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/enum_const_arg.dart.json.expect index 8f7a8cb5e56..5d787917ec2 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/enum_const_arg.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/enum_const_arg.dart.json.expect @@ -31,8 +31,12 @@ "type": "with_arguments" } ], - "identifier": { - "name": "doSomething", + "definition": { + "path": [ + { + "name": "doSomething" + } + ], "uri": "package:record_use_test/enum_const_arg.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/extension.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/extension.dart.json.expect index 8076745b9d0..7b98ca92f20 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/extension.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/extension.dart.json.expect @@ -20,8 +20,12 @@ "type": "with_arguments" } ], - "identifier": { - "name": "_extension#0|callWithArgs", + "definition": { + "path": [ + { + "name": "_extension#0|callWithArgs" + } + ], "uri": "package:record_use_test/extension.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/instance_class.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/instance_class.dart.json.expect index e686c4ab8b1..9a900b22fbe 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/instance_class.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/instance_class.dart.json.expect @@ -17,8 +17,12 @@ }, "recordings": [ { - "identifier": { - "name": "MyClass", + "definition": { + "path": [ + { + "name": "MyClass" + } + ], "uri": "package:record_use_test/instance_class.dart" }, "instances": [ diff --git a/pkg/vm/testcases/transformations/record_use/lib/instance_complex.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/instance_complex.dart.json.expect index b5a76e2c1b9..0aa9bec5c4b 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/instance_complex.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/instance_complex.dart.json.expect @@ -73,8 +73,12 @@ }, "recordings": [ { - "identifier": { - "name": "MyClass", + "definition": { + "path": [ + { + "name": "MyClass" + } + ], "uri": "package:record_use_test/instance_complex.dart" }, "instances": [ diff --git a/pkg/vm/testcases/transformations/record_use/lib/instance_duplicates.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/instance_duplicates.dart.json.expect index e71ac22c810..be81faa5961 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/instance_duplicates.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/instance_duplicates.dart.json.expect @@ -27,8 +27,12 @@ }, "recordings": [ { - "identifier": { - "name": "MyClass", + "definition": { + "path": [ + { + "name": "MyClass" + } + ], "uri": "package:record_use_test/instance_duplicates.dart" }, "instances": [ diff --git a/pkg/vm/testcases/transformations/record_use/lib/instance_not_annotation.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/instance_not_annotation.dart.json.expect index 75af6ec7ad6..408df09417e 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/instance_not_annotation.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/instance_not_annotation.dart.json.expect @@ -10,8 +10,12 @@ }, "recordings": [ { - "identifier": { - "name": "MyClass", + "definition": { + "path": [ + { + "name": "MyClass" + } + ], "uri": "package:record_use_test/instance_not_annotation.dart" }, "instances": [ diff --git a/pkg/vm/testcases/transformations/record_use/lib/loading_units_multiple.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/loading_units_multiple.dart.json.expect index 5887e449f22..776962f8687 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/loading_units_multiple.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/loading_units_multiple.dart.json.expect @@ -27,9 +27,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/loading_units_multiple_helper_shared.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/loading_units_simple.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/loading_units_simple.dart.json.expect index c1ddcb182f0..268f09fc3ea 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/loading_units_simple.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/loading_units_simple.dart.json.expect @@ -20,9 +20,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/loading_units_simple.dart" } }, @@ -36,9 +42,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/loading_units_simple_helper.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/map_complex_keys.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/map_complex_keys.dart.json.expect index 8b43c48244d..a9bf1c9d5bf 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/map_complex_keys.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/map_complex_keys.dart.json.expect @@ -45,9 +45,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/map_complex_keys.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/named_and_positional.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/named_and_positional.dart.json.expect index 4a444a44d1b..6aec2b737a9 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/named_and_positional.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/named_and_positional.dart.json.expect @@ -76,9 +76,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/named_and_positional.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/named_both.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/named_both.dart.json.expect index 8aa865a55d9..82d8184c8b5 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/named_both.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/named_both.dart.json.expect @@ -68,9 +68,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/named_both.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/named_optional.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/named_optional.dart.json.expect index db4b77e2690..762cb7fd249 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/named_optional.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/named_optional.dart.json.expect @@ -31,9 +31,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/named_optional.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/named_required.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/named_required.dart.json.expect index 89e78c6b35d..00b7f4cebbf 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/named_required.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/named_required.dart.json.expect @@ -31,9 +31,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/named_required.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/named_with_function_arg.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/named_with_function_arg.dart.json.expect index b1d4676b6de..9ef32b176f1 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/named_with_function_arg.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/named_with_function_arg.dart.json.expect @@ -23,8 +23,12 @@ "type": "with_arguments" } ], - "identifier": { - "name": "Ext|foo", + "definition": { + "path": [ + { + "name": "Ext|foo" + } + ], "uri": "package:record_use_test/named_with_function_arg.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/nested.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/nested.dart.json.expect index 25a0b275944..be6ede6df95 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/nested.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/nested.dart.json.expect @@ -30,8 +30,12 @@ }, "recordings": [ { - "identifier": { - "name": "MyClass", + "definition": { + "path": [ + { + "name": "MyClass" + } + ], "uri": "package:record_use_test/nested.dart" }, "instances": [ @@ -48,8 +52,12 @@ ] }, { - "identifier": { - "name": "MyOtherClass", + "definition": { + "path": [ + { + "name": "MyOtherClass" + } + ], "uri": "package:record_use_test/nested.dart" }, "instances": [ diff --git a/pkg/vm/testcases/transformations/record_use/lib/nested_instance_constant.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/nested_instance_constant.dart.json.expect index 80d9753a00b..a9a7f306459 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/nested_instance_constant.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/nested_instance_constant.dart.json.expect @@ -17,8 +17,12 @@ }, "recordings": [ { - "identifier": { - "name": "Recorded", + "definition": { + "path": [ + { + "name": "Recorded" + } + ], "uri": "package:record_use_test/nested_instance_constant.dart" }, "instances": [ diff --git a/pkg/vm/testcases/transformations/record_use/lib/partfile_main.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/partfile_main.dart.json.expect index 21bfe49a1bb..d864e62e78d 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/partfile_main.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/partfile_main.dart.json.expect @@ -20,9 +20,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/partfile_main.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/positional_both.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/positional_both.dart.json.expect index d9d49c3f8aa..859bc42b37e 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/positional_both.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/positional_both.dart.json.expect @@ -41,9 +41,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/positional_both.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/positional_both_with_type_argument.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/positional_both_with_type_argument.dart.json.expect index 5c527c43c9a..a5a4d57a560 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/positional_both_with_type_argument.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/positional_both_with_type_argument.dart.json.expect @@ -41,9 +41,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/positional_both_with_type_argument.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/positional_optional.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/positional_optional.dart.json.expect index 4c197eb2f0d..0c6cfc5a774 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/positional_optional.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/positional_optional.dart.json.expect @@ -31,9 +31,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/positional_optional.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/record_enum.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/record_enum.dart.json.expect index 1898a47fb29..2601502219e 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/record_enum.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/record_enum.dart.json.expect @@ -28,8 +28,12 @@ }, "recordings": [ { - "identifier": { - "name": "MyClass", + "definition": { + "path": [ + { + "name": "MyClass" + } + ], "uri": "package:record_use_test/record_enum.dart" }, "instances": [ diff --git a/pkg/vm/testcases/transformations/record_use/lib/record_instance_constant_empty.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/record_instance_constant_empty.dart.json.expect index d85e38f2cb5..88fd916b86d 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/record_instance_constant_empty.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/record_instance_constant_empty.dart.json.expect @@ -16,8 +16,12 @@ }, "recordings": [ { - "identifier": { - "name": "MyClass", + "definition": { + "path": [ + { + "name": "MyClass" + } + ], "uri": "package:record_use_test/record_instance_constant_empty.dart" }, "instances": [ diff --git a/pkg/vm/testcases/transformations/record_use/lib/simple.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/simple.dart.json.expect index 75a8504ab85..8ba5b2f4b2c 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/simple.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/simple.dart.json.expect @@ -20,9 +20,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/simple.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/tearoff.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/tearoff.dart.json.expect index 307db6428ce..60de20f0dae 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/tearoff.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/tearoff.dart.json.expect @@ -11,9 +11,15 @@ "type": "tearoff" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/tearoff.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/top_level_method.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/top_level_method.dart.json.expect index 73b9fc2ccd0..0b2bd553e9d 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/top_level_method.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/top_level_method.dart.json.expect @@ -20,8 +20,12 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someTopLevelMethod", + "definition": { + "path": [ + { + "name": "someTopLevelMethod" + } + ], "uri": "package:record_use_test/top_level_method.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/types_of_arguments.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/types_of_arguments.dart.json.expect index 90fe5f1911f..1be0774d26f 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/types_of_arguments.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/types_of_arguments.dart.json.expect @@ -117,9 +117,15 @@ "type": "with_arguments" } ], - "identifier": { - "name": "someStaticMethod", - "scope": "SomeClass", + "definition": { + "path": [ + { + "name": "SomeClass" + }, + { + "name": "someStaticMethod" + } + ], "uri": "package:record_use_test/types_of_arguments.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/unsupported_collections.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/unsupported_collections.dart.json.expect index 377833771ff..f1cc529b551 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/unsupported_collections.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/unsupported_collections.dart.json.expect @@ -46,8 +46,12 @@ "type": "with_arguments" } ], - "identifier": { - "name": "recorded", + "definition": { + "path": [ + { + "name": "recorded" + } + ], "uri": "package:record_use_test/unsupported_collections.dart" } } diff --git a/pkg/vm/testcases/transformations/record_use/lib/unsupported_instance.dart.json.expect b/pkg/vm/testcases/transformations/record_use/lib/unsupported_instance.dart.json.expect index 04e4bde4a43..ca3d7aab459 100644 --- a/pkg/vm/testcases/transformations/record_use/lib/unsupported_instance.dart.json.expect +++ b/pkg/vm/testcases/transformations/record_use/lib/unsupported_instance.dart.json.expect @@ -26,14 +26,22 @@ "type": "with_arguments" } ], - "identifier": { - "name": "recorded", + "definition": { + "path": [ + { + "name": "recorded" + } + ], "uri": "package:record_use_test/unsupported_instance.dart" } }, { - "identifier": { - "name": "MyClass", + "definition": { + "path": [ + { + "name": "MyClass" + } + ], "uri": "package:record_use_test/unsupported_instance.dart" }, "instances": [