-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CFE/VM] Fix expression evaluation to not introduce new parameters be…
…cause of extension types To support expression evaluation on extension types - which are a static thing and thus doesn't exist in the VM - on the CFE side we try to find the available variables so that, for any variables that are found to be extension types, we can treat them as such. This was introduced in https://dart-review.googlesource.com/c/sdk/+/339900. The problem is that this could accidentally _introduce_ new variables, which would introduce new arguments to the created procedure causing weird behavior in the VM as for instance seen in #56911. This CL makes sure to only set the type for already known variables (as passed by the VM), thus not introducing new variables and fixing the issues seen. Fixes #56911 Change-Id: Ie8b8ae12438338e9c3d248d00cc5da81df5b8ece Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/400120 Reviewed-by: Johnni Winther <[email protected]> Reviewed-by: Derek Xu <[email protected]> Commit-Queue: Jens Johansen <[email protected]>
- Loading branch information
Showing
5 changed files
with
155 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
pkg/front_end/testcases/expression/issue_56911_01.expression.yaml.expect
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Errors: { | ||
| } | ||
| static method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr(#lib1::ExtensionType% /* erasure=dart.core::String, declared=! */ input, dart.core::List<#lib1::ExtensionType% /* erasure=dart.core::String, declared=! */> list) → dynamic | ||
| static method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr(#lib1::ExtensionType% /* erasure=dart.core::String, declared=! */ input) → dynamic | ||
| return #lib1::ExtensionType|get#value(input); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| // Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file | ||
| // 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. | ||
|
|
||
| import 'dart:developer'; | ||
| import 'package:test/test.dart'; | ||
| import 'package:vm_service/vm_service.dart'; | ||
| import 'common/service_test_common.dart'; | ||
| import 'common/test_helper.dart'; | ||
|
|
||
| // AUTOGENERATED START | ||
| // | ||
| // Update these constants by running: | ||
| // | ||
| // dart pkg/vm_service/test/update_line_numbers.dart <test.dart> | ||
| // | ||
| const LINE_A = 28; | ||
| const LINE_B = 32; | ||
| // AUTOGENERATED END | ||
|
|
||
| extension type ExtensionType._(String s) { | ||
| ExtensionType(int i) : this._('$i'); | ||
| int get value => s.codeUnitAt(0); | ||
| } | ||
|
|
||
| void code() { | ||
| final list = [ExtensionType(0)]; | ||
| debugger(); // LINE_A | ||
| print(list.single.value); | ||
| // ignore: avoid_function_literals_in_foreach_calls | ||
| list.forEach((ExtensionType input) { | ||
| debugger(); // LINE_B | ||
| print(input.value); | ||
| }); | ||
| } | ||
|
|
||
| Future<void> Function(VmService, IsolateRef) test( | ||
| String topFrameName, | ||
| List<String> availableVariables, | ||
| List<(String evaluate, String evaluationResult)> evaluations, | ||
| ) { | ||
| return (VmService service, IsolateRef isolateRef) async { | ||
| final isolateId = isolateRef.id!; | ||
| final stack = await service.getStack(isolateId); | ||
|
|
||
| // Make sure we are in the right place. | ||
| expect(stack.frames!.length, greaterThanOrEqualTo(1)); | ||
| expect(stack.frames![0].function!.name, topFrameName); | ||
|
|
||
| // Check variables. | ||
| expect( | ||
| (stack.frames![0].vars ?? []).map((v) => v.name).toList(), | ||
| equals(availableVariables), | ||
| ); | ||
|
|
||
| // Evaluate. | ||
| for (final (expression, expectedResult) in evaluations) { | ||
| final result = await service.evaluateInFrame( | ||
| isolateId, | ||
| /* frame = */ 0, | ||
| expression, | ||
| ) as InstanceRef; | ||
| print(result.valueAsString); | ||
| expect(result.valueAsString, equals(expectedResult)); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| final tests = <IsolateTest>[ | ||
| hasStoppedAtBreakpoint, | ||
| stoppedAtLine(LINE_A), | ||
| test('code', [ | ||
| 'list', | ||
| ], [ | ||
| ('() { return list.single.value; }()', '48'), | ||
| ('list.single.value', '48'), | ||
| ]), | ||
| resumeIsolate, | ||
| hasStoppedAtBreakpoint, | ||
| stoppedAtLine(LINE_B), | ||
| test('<anonymous closure>', [ | ||
| 'input', | ||
| ], [ | ||
| ('() { return input.value; }()', '48'), | ||
| ('input.value', '48'), | ||
| ]), | ||
| ]; | ||
|
|
||
| void main([args = const <String>[]]) => runIsolateTests( | ||
| args, | ||
| tests, | ||
| 'issue_56911_test.dart', | ||
| testeeConcurrent: code, | ||
| pauseOnStart: false, | ||
| pauseOnExit: true, | ||
| ); |