languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 11:58:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[vm/service] Handle raw types in CollectStringifiedType

Browse source 
This function did not handle raw types correctly: it assumed that
TAV is always non-null, but VM replaces TAVs of form
`<dynamic, ..., dynamic>` with `null`. We needed to handle
this case specially.

Fixes https://github.com/dart-lang/sdk/issues/53453

TEST=service/evaluate_variable_of_raw_type_test

Change-Id: If0a2669fd722fb0e0871138a68814a751888f4b0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/325420
Reviewed-by: Daco Harkes <dacoharkes@google.com>
Commit-Queue: Slava Egorov <vegorov@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
Auto-Submit: Slava Egorov <vegorov@google.com>
This commit is contained in:
Vyacheslav Egorov 2023-09-12 12:09:06 +00:00 committed by Commit Queue
parent c15f054809
commit 1a0e5dea69
2 changed files with 53 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
runtime/observatory/tests/service/evaluate_variable_of_raw_type_test.dart Normal file
View file

@ -0,0 +1,30 @@
// Copyright (c) 2023, 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:observatory/models.dart' show InstanceKind;
import 'package:observatory/service_io.dart';
import 'package:test/test.dart';
import 'service_test_common.dart';
import 'test_helper.dart';
void testFunction() {
List<dynamic> v = <dynamic>[1, 2, '3'];
debugger();
print("v = $v");
}
var tests = <IsolateTest>[
hasStoppedAtBreakpoint,
(Isolate isolate) async {
final result = await isolate.evalFrame(0, '''v.length''');
print(result);
final instance = result as Instance;
expect(instance.valueAsString, equals('3'));
expect(instance.kind, equals(InstanceKind.int));
},
];
main(args) => runIsolateTests(args, tests, testeeConcurrent: testFunction);

33
runtime/vm/service.cc
View file

@ -2895,7 +2895,8 @@ static const MethodParameter* const build_expression_evaluation_scope_params[] =
nullptr,
};
static void CollectStringifiedType(Zone* zone,
static void CollectStringifiedType(Thread* thread,
Zone* zone,
const AbstractType& type,
const GrowableObjectArray& output) {
Instance& instance = Instance::Handle(zone);
@ -2938,13 +2939,25 @@ static void CollectStringifiedType(Zone* zone,
instance ^= Smi::New((intptr_t)type.nullability());
output.Add(instance);
const TypeArguments& srcArguments =
const TypeArguments& type_arguments =
TypeArguments::Handle(Type::Cast(type).arguments());
instance ^= Smi::New(srcArguments.Length());
output.Add(instance);
for (int i = 0; i < srcArguments.Length(); i++) {
const AbstractType& src_type = AbstractType::Handle(srcArguments.TypeAt(i));
CollectStringifiedType(zone, src_type, output);
if (!type_arguments.IsNull()) {
instance ^= Smi::New(type_arguments.Length());
output.Add(instance);
AbstractType& src_type = AbstractType::Handle();
for (intptr_t i = 0; i < type_arguments.Length(); i++) {
src_type = type_arguments.TypeAt(i);
CollectStringifiedType(thread, zone, src_type, output);
}
} else {
const intptr_t num_type_parameters = cls.NumTypeParameters(thread);
instance ^= Smi::New(num_type_parameters);
output.Add(instance);
const AbstractType& dynamic_type =
AbstractType::Handle(Type::DynamicType());
for (intptr_t i = 0; i < num_type_parameters; i++) {
CollectStringifiedType(thread, zone, dynamic_type, output);
}
}
}
@ -3088,7 +3101,7 @@ static void BuildExpressionEvaluationScope(Thread* thread, JSONStream* js) {
} else if (obj.IsInstance()) {
instance ^= param_values.At(i);
type = instance.GetType(Heap::kNew);
CollectStringifiedType(zone, type, param_types);
CollectStringifiedType(thread, zone, type, param_types);
}
}
for (intptr_t i = 0; i < param_types.Length(); i++) {
@ -3112,7 +3125,7 @@ static void BuildExpressionEvaluationScope(Thread* thread, JSONStream* js) {
AbstractType& type = AbstractType::Handle();
for (intptr_t i = 0; i < type_params_bounds.Length(); i++) {
type ^= type_params_bounds.At(i);
CollectStringifiedType(zone, type, type_params_bounds_strings);
CollectStringifiedType(thread, zone, type, type_params_bounds_strings);
}
Instance& instance = Instance::Handle();
for (intptr_t i = 0; i < type_params_bounds_strings.Length(); i++) {
@ -3127,7 +3140,7 @@ static void BuildExpressionEvaluationScope(Thread* thread, JSONStream* js) {
AbstractType& type = AbstractType::Handle();
for (intptr_t i = 0; i < type_params_defaults.Length(); i++) {
type ^= type_params_defaults.At(i);
CollectStringifiedType(zone, type, type_params_defaults_strings);
CollectStringifiedType(thread, zone, type, type_params_defaults_strings);
}
Instance& instance = Instance::Handle();
for (intptr_t i = 0; i < type_params_defaults_strings.Length(); i++) {