From 933537b66bcc91f50de8e5007b956d42bb88a62b Mon Sep 17 00:00:00 2001 From: Jacob Richman Date: Tue, 7 Nov 2023 17:49:53 +0000 Subject: [PATCH] Trivial cleanup to make VSCode workspace for the SDK free of diagnostics as long as you filter with "!TODO" R=athom@google.com, jensj@google.com, natebiggs@google.com Change-Id: I73cf3c5ef6dab81808330c4eb5f44cb62e753c81 Tested: manually verified that VSCode is warning free. No changes in functionality. Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/333903 Auto-Submit: Jacob Richman Reviewed-by: Alexander Thomas Reviewed-by: Martin Kustermann Reviewed-by: Nate Biggs Commit-Queue: Jacob Richman --- .../dart/IsolateSpawnMemory.dart | 9 +- .../dart/LongStringCompare.dart | 13 +-- .../dart/RecordCollections.dart | 22 ++--- benchmarks/SwitchFSM/dart/state_class.dart | 2 + benchmarks/SwitchFSM/dart/state_string.dart | 2 + benchmarks/TypedData/dart/TypedData.dart | 88 +++++++++---------- .../TypedDataCopy/dart/TypedDataCopy.dart | 10 +-- benchmarks/UiMatrix/dart/uimatrix.dart | 49 ++++++----- benchmarks/analysis_options.yaml | 3 +- pkg/compiler/lib/src/native/enqueue.dart | 2 +- pkg/test_runner/lib/src/command_output.dart | 6 +- runtime/observatory/lib/object_graph.dart | 5 ++ runtime/observatory/lib/src/app/page.dart | 2 +- .../lib/src/elements/debugger.dart | 1 + .../lib/src/elements/heap_snapshot.dart | 1 - .../lib/src/elements/metric/graph.dart | 1 - .../lib/src/elements/persistent_handles.dart | 2 +- .../lib/src/repositories/isolate_group.dart | 4 +- .../lib/src/repositories/timeline.dart | 3 - runtime/tools/dartfuzz/dartfuzz.dart | 14 +-- .../tools/dartfuzz/dartfuzz_api_table.dart | 2 +- runtime/tools/dartfuzz/dartfuzz_test.dart | 4 +- runtime/tools/dartfuzz/gen_type_table.dart | 13 +-- runtime/tools/dartfuzz/gen_util.dart | 4 +- runtime/tools/ffi/sdk_lib_ffi_generator.dart | 2 + sdk.code-workspace | 4 + 26 files changed, 148 insertions(+), 120 deletions(-) diff --git a/benchmarks/IsolateSpawnMemory/dart/IsolateSpawnMemory.dart b/benchmarks/IsolateSpawnMemory/dart/IsolateSpawnMemory.dart index 3aa18f6c2a3..a6cfe56a6ac 100644 --- a/benchmarks/IsolateSpawnMemory/dart/IsolateSpawnMemory.dart +++ b/benchmarks/IsolateSpawnMemory/dart/IsolateSpawnMemory.dart @@ -141,7 +141,7 @@ Future currentHeapUsage(String wsUri) async { final usage = await vmService.getIsolateGroupMemoryUsage(groupId); sum += usage.heapUsage! + usage.externalUsage!; } - vmService.dispose(); + unawaited(vmService.dispose()); return sum; } @@ -165,9 +165,12 @@ Future> getGroupIds(vm_service.VmService vmService) async { for (final groupRef in vm.isolateGroups!) { final group = await vmService.getIsolateGroup(groupRef.id!); for (final isolateRef in group.isolates!) { - final isolateOrSentinel = await vmService.getIsolate(isolateRef.id!); - if (isolateOrSentinel is vm_service.Isolate) { + try { + await vmService.getIsolate(isolateRef.id!); groupIds.add(groupRef.id!); + break; + } on vm_service.SentinelException catch (_) { + // Skip groups with only sentinels. } } } diff --git a/benchmarks/LongStringCompare/dart/LongStringCompare.dart b/benchmarks/LongStringCompare/dart/LongStringCompare.dart index cd54576471f..b6845858d4b 100644 --- a/benchmarks/LongStringCompare/dart/LongStringCompare.dart +++ b/benchmarks/LongStringCompare/dart/LongStringCompare.dart @@ -4,6 +4,9 @@ // // Measure performance of string comparison. +// Using string interpolation could change what this test is measuring. +// ignore_for_file: prefer_interpolation_to_compose_strings + import 'package:benchmark_harness/benchmark_harness.dart'; int equalCount = 0; @@ -13,14 +16,14 @@ class LongStringCompare extends BenchmarkBase { final List s = []; String generateLongString(int lengthPower) { - return "abc" * (1 << lengthPower) + "def"; + return 'abc' * (1 << lengthPower) + 'def'; } LongStringCompare(int lengthPower, this.reps) : super('LongStringCompare.${1 << lengthPower}.${reps}reps') { final single = generateLongString(lengthPower); - s.add(single + "." + single); - s.add(single + "!" + single); + s.add(single + '.' + single); + s.add(single + '!' + single); } @override @@ -34,7 +37,7 @@ class LongStringCompare extends BenchmarkBase { void run() { for (int i = 0; i < reps; i++) { // Make string comparison code hoisting harder for the compiler to do. - bool comparison = s[i % 2] == s[(i + 1) % 2]; + final bool comparison = s[i % 2] == s[(i + 1) % 2]; if (comparison) { equalCount++; } @@ -46,5 +49,5 @@ void main() { LongStringCompare(1, 3000).report(); LongStringCompare(5, 1000).report(); LongStringCompare(10, 30).report(); - if (equalCount > 0) throw StateError("Unexpected equalCount: $equalCount"); + if (equalCount > 0) throw StateError('Unexpected equalCount: $equalCount'); } diff --git a/benchmarks/RecordCollections/dart/RecordCollections.dart b/benchmarks/RecordCollections/dart/RecordCollections.dart index 1eea5d06f08..01d5001cc90 100644 --- a/benchmarks/RecordCollections/dart/RecordCollections.dart +++ b/benchmarks/RecordCollections/dart/RecordCollections.dart @@ -18,7 +18,9 @@ class Pair { final int v0; final int v1; const Pair(this.v0, this.v1); + @override bool operator ==(other) => other is Pair && v0 == other.v0 && v1 == other.v1; + @override int get hashCode => Object.hash(v0, v1); } @@ -30,7 +32,7 @@ List getPolymorphicListOfClass( if (withValues) { return List.generate(length, (i) => Pair(i, i), growable: growable); } else { - return List.filled(length, Pair(-1, -1), growable: growable); + return List.filled(length, const Pair(-1, -1), growable: growable); } } else { return List.filled(0, '', growable: growable); @@ -89,7 +91,7 @@ class BenchListAddPolyClass extends BenchmarkBase { list.add(Pair(i, i)); } final int mid = (list[N ~/ 2] as Pair).v0; - if (mid != N ~/ 2) throw 'Bad result: ${mid}'; + if (mid != N ~/ 2) throw 'Bad result: $mid'; } } @@ -104,7 +106,7 @@ class BenchListAddPolyRecord extends BenchmarkBase { list.add((i, i)); } final int mid = (list[N ~/ 2] as (int, int)).$1; - if (mid != N ~/ 2) throw 'Bad result: ${mid}'; + if (mid != N ~/ 2) throw 'Bad result: $mid'; } } @@ -113,7 +115,7 @@ class BenchListSetIndexedClass extends BenchmarkBase { @override void run() { - final list = List.filled(N, Pair(-1, -1), growable: false); + final list = List.filled(N, const Pair(-1, -1), growable: false); for (int i = 0; i < N; ++i) { list[i] = Pair(i, i); } @@ -146,7 +148,7 @@ class BenchListSetIndexedPolyClass extends BenchmarkBase { list[i] = Pair(i, i); } final int mid = (list[N ~/ 2] as Pair).v0; - if (mid != N ~/ 2) throw 'Bad result: ${mid}'; + if (mid != N ~/ 2) throw 'Bad result: $mid'; } } @@ -162,7 +164,7 @@ class BenchListSetIndexedPolyRecord extends BenchmarkBase { list[i] = (i, i); } final int mid = (list[N ~/ 2] as (int, int)).$1; - if (mid != N ~/ 2) throw 'Bad result: ${mid}'; + if (mid != N ~/ 2) throw 'Bad result: $mid'; } } @@ -366,7 +368,7 @@ class BenchMapLookupClass extends BenchmarkBase { for (int i = 0; i < N; ++i) { sum += map[Pair(i, i)]!; } - if (sum != SUM) throw 'Bad result: ${sum}'; + if (sum != SUM) throw 'Bad result: $sum'; } } @@ -383,7 +385,7 @@ class BenchMapLookupRecord extends BenchmarkBase { for (int i = 0; i < N; ++i) { sum += map[(i, i)]!; } - if (sum != SUM) throw 'Bad result: ${sum}'; + if (sum != SUM) throw 'Bad result: $sum'; } } @@ -426,7 +428,7 @@ class BenchSetLookupClass extends BenchmarkBase { for (int i = 0; i < N; ++i) { sum += set.contains(Pair(i, i)) ? 1 : 0; } - if (sum != N ~/ 2) throw 'Bad result: ${sum}'; + if (sum != N ~/ 2) throw 'Bad result: $sum'; } } @@ -443,7 +445,7 @@ class BenchSetLookupRecord extends BenchmarkBase { for (int i = 0; i < N; ++i) { sum += set.contains((i, i)) ? 1 : 0; } - if (sum != N ~/ 2) throw 'Bad result: ${sum}'; + if (sum != N ~/ 2) throw 'Bad result: $sum'; } } diff --git a/benchmarks/SwitchFSM/dart/state_class.dart b/benchmarks/SwitchFSM/dart/state_class.dart index 719b00bd973..a761271709c 100644 --- a/benchmarks/SwitchFSM/dart/state_class.dart +++ b/benchmarks/SwitchFSM/dart/state_class.dart @@ -2,6 +2,8 @@ // 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. +// ignore_for_file: unused_field + typedef State = _Class; class _Class { diff --git a/benchmarks/SwitchFSM/dart/state_string.dart b/benchmarks/SwitchFSM/dart/state_string.dart index 19506e6c44b..b2f7c8ab277 100644 --- a/benchmarks/SwitchFSM/dart/state_string.dart +++ b/benchmarks/SwitchFSM/dart/state_string.dart @@ -2,6 +2,8 @@ // 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. +// ignore_for_file: unused_field + typedef State = _Strings; class _Strings { diff --git a/benchmarks/TypedData/dart/TypedData.dart b/benchmarks/TypedData/dart/TypedData.dart index 8c98bad35e7..660bf73fcdb 100644 --- a/benchmarks/TypedData/dart/TypedData.dart +++ b/benchmarks/TypedData/dart/TypedData.dart @@ -827,50 +827,50 @@ class Float64ListViewVarBench extends BenchmarkBase { void main() { final microBenchmarks = [ - () => Int8ListBench(), - () => Uint8ListBench(), - () => Uint8ClampedListBench(), - () => Int16ListBench(), - () => Uint16ListBench(), - () => Int32ListBench(), - () => Uint32ListBench(), - () => Int64ListBench(), - () => Uint64ListBench(), - () => Float32ListBench(), - () => Float64ListBench(), - () => Int8ListViewBench(), - () => Uint8ListViewBench(), - () => Uint8ClampedListViewBench(), - () => Int16ListViewBench(), - () => Uint16ListViewBench(), - () => Int32ListViewBench(), - () => Uint32ListViewBench(), - () => Int64ListViewBench(), - () => Uint64ListViewBench(), - () => Float32ListViewBench(), - () => Float64ListViewBench(), - () => Int8ListVarBench(), - () => Uint8ListVarBench(), - () => Uint8ClampedListVarBench(), - () => Int16ListVarBench(), - () => Uint16ListVarBench(), - () => Int32ListVarBench(), - () => Uint32ListVarBench(), - () => Int64ListVarBench(), - () => Uint64ListVarBench(), - () => Float32ListVarBench(), - () => Float64ListVarBench(), - () => Int8ListViewVarBench(), - () => Uint8ListViewVarBench(), - () => Uint8ClampedListViewVarBench(), - () => Int16ListViewVarBench(), - () => Uint16ListViewVarBench(), - () => Int32ListViewVarBench(), - () => Uint32ListViewVarBench(), - () => Int64ListViewVarBench(), - () => Uint64ListViewVarBench(), - () => Float32ListViewVarBench(), - () => Float64ListViewVarBench(), + Int8ListBench.new, + Uint8ListBench.new, + Uint8ClampedListBench.new, + Int16ListBench.new, + Uint16ListBench.new, + Int32ListBench.new, + Uint32ListBench.new, + Int64ListBench.new, + Uint64ListBench.new, + Float32ListBench.new, + Float64ListBench.new, + Int8ListViewBench.new, + Uint8ListViewBench.new, + Uint8ClampedListViewBench.new, + Int16ListViewBench.new, + Uint16ListViewBench.new, + Int32ListViewBench.new, + Uint32ListViewBench.new, + Int64ListViewBench.new, + Uint64ListViewBench.new, + Float32ListViewBench.new, + Float64ListViewBench.new, + Int8ListVarBench.new, + Uint8ListVarBench.new, + Uint8ClampedListVarBench.new, + Int16ListVarBench.new, + Uint16ListVarBench.new, + Int32ListVarBench.new, + Uint32ListVarBench.new, + Int64ListVarBench.new, + Uint64ListVarBench.new, + Float32ListVarBench.new, + Float64ListVarBench.new, + Int8ListViewVarBench.new, + Uint8ListViewVarBench.new, + Uint8ClampedListViewVarBench.new, + Int16ListViewVarBench.new, + Uint16ListViewVarBench.new, + Int32ListViewVarBench.new, + Uint32ListViewVarBench.new, + Int64ListViewVarBench.new, + Uint64ListViewVarBench.new, + Float32ListViewVarBench.new, + Float64ListViewVarBench.new, ]; for (var mbm in microBenchmarks) { mbm().report(); diff --git a/benchmarks/TypedDataCopy/dart/TypedDataCopy.dart b/benchmarks/TypedDataCopy/dart/TypedDataCopy.dart index 7e2de14d2ce..e0ddf7849cb 100644 --- a/benchmarks/TypedDataCopy/dart/TypedDataCopy.dart +++ b/benchmarks/TypedDataCopy/dart/TypedDataCopy.dart @@ -6,11 +6,11 @@ import 'TypedDataCopyLib.dart'; void main() { final benchmarks = [ - () => Int8ViewToInt8View(), - () => Int8ToInt8(), - () => Int8ToUint8Clamped(), - () => Int8ViewToInt8(), - () => ByteSwap(), + Int8ViewToInt8View.new, + Int8ToInt8.new, + Int8ToUint8Clamped.new, + Int8ViewToInt8.new, + ByteSwap.new, ]; // Run all the code to ensure consistent polymorphism in shared code. diff --git a/benchmarks/UiMatrix/dart/uimatrix.dart b/benchmarks/UiMatrix/dart/uimatrix.dart index 52eacb4f45d..02fb2e10410 100644 --- a/benchmarks/UiMatrix/dart/uimatrix.dart +++ b/benchmarks/UiMatrix/dart/uimatrix.dart @@ -76,7 +76,7 @@ final class UiMatrix { /// 0 0 0 1 /// /// If both `x` and `y` are zero, returns the [identity] constant. - static UiMatrix translation2d({ required double dx, required double dy }) { + static UiMatrix translation2d({required double dx, required double dy}) { if (dx == 0 && dy == 0) { return identity; } @@ -234,8 +234,12 @@ final class UiMatrix { required double m11, required double m03, required double m13, - _MatrixExtension? rest = null, - }) : _m00 = m00, _m11 = m11, _m03 = m03, _m13 = m13, _rest = rest; + _MatrixExtension? rest, + }) : _m00 = m00, + _m11 = m11, + _m03 = m03, + _m13 = m13, + _rest = rest; final double _m00; final double _m11; @@ -272,7 +276,7 @@ final class UiMatrix { _MatrixExtension? rest; if (otherRest != null || selfRest != null) { rest = (selfRest ?? _MatrixExtension._identityExtension) + - (otherRest ?? _MatrixExtension._identityExtension); + (otherRest ?? _MatrixExtension._identityExtension); } return UiMatrix._( @@ -310,11 +314,13 @@ final class UiMatrix { m13: _m13 + _m11 * n13, ); } else { - return _generalMultiply(this, selfRest, other, _MatrixExtension._identityExtension); + return _generalMultiply( + this, selfRest, other, _MatrixExtension._identityExtension); } } else { if (selfRest == null) { - return _generalMultiply(this, _MatrixExtension._identityExtension, other, otherRest); + return _generalMultiply( + this, _MatrixExtension._identityExtension, other, otherRest); } else { return _generalMultiply(this, selfRest, other, otherRest); } @@ -356,8 +362,8 @@ final class UiMatrix { return UiMatrix.simple2d( scaleX: a11 * invDet, scaleY: a00 * invDet, - dx: - a11 * a30 * invDet, - dy: - a00 * a31 * invDet, + dx: -a11 * a30 * invDet, + dy: -a00 * a31 * invDet, ); } else { return _generalInvert(this, rest); @@ -395,18 +401,18 @@ final class _MatrixExtension { required double m31, required double m32, required double m33, - }) : _m01 = m01, - _m02 = m02, - _m10 = m10, - _m12 = m12, - _m20 = m20, - _m21 = m21, - _m22 = m22, - _m23 = m23, - _m30 = m30, - _m31 = m31, - _m32 = m32, - _m33 = m33; + }) : _m01 = m01, + _m02 = m02, + _m10 = m10, + _m12 = m12, + _m20 = m20, + _m21 = m21, + _m22 = m22, + _m23 = m23, + _m30 = m30, + _m31 = m31, + _m32 = m32, + _m33 = m33; final double _m01; final double _m02; @@ -456,7 +462,8 @@ final class _MatrixExtension { } } -UiMatrix _generalMultiply(UiMatrix m, _MatrixExtension mExt, UiMatrix n, _MatrixExtension nExt) { +UiMatrix _generalMultiply( + UiMatrix m, _MatrixExtension mExt, UiMatrix n, _MatrixExtension nExt) { final double m00 = m._m00; final double m01 = mExt._m01; final double m02 = mExt._m02; diff --git a/benchmarks/analysis_options.yaml b/benchmarks/analysis_options.yaml index 1dd81617ef9..f646d65ec1f 100644 --- a/benchmarks/analysis_options.yaml +++ b/benchmarks/analysis_options.yaml @@ -39,10 +39,9 @@ linter: - hash_and_equals - implementation_imports #- invariant_booleans - - iterable_contains_unrelated_type + - collection_methods_unrelated_type - library_names - library_prefixes - - list_remove_unrelated_type #- literal_only_boolean_expressions - no_adjacent_strings_in_list - no_duplicate_case_values diff --git a/pkg/compiler/lib/src/native/enqueue.dart b/pkg/compiler/lib/src/native/enqueue.dart index bcf9b867479..2811665bf62 100644 --- a/pkg/compiler/lib/src/native/enqueue.dart +++ b/pkg/compiler/lib/src/native/enqueue.dart @@ -225,7 +225,7 @@ class NativeCodegenEnqueuer extends NativeEnqueuer { _registerTypeUses(impactBuilder, _nativeClasses /*, 'forced'*/); } - // HACK - add all the resolved classes. + // TODO: this code is a bit of a hack to add all the resolved classes. Set matchingClasses = {}; for (ClassEntity classElement in _nativeClasses) { if (_unusedClasses.contains(classElement)) { diff --git a/pkg/test_runner/lib/src/command_output.dart b/pkg/test_runner/lib/src/command_output.dart index 5b9cfa449d7..65c2e4fe264 100644 --- a/pkg/test_runner/lib/src/command_output.dart +++ b/pkg/test_runner/lib/src/command_output.dart @@ -108,12 +108,12 @@ class CommandOutput { bool _didFail(TestCase testCase) => exitCode != 0 && !hasCrashed; bool get canRunDependentCommands { - // FIXME(kustermann): We may need to change this + // TODO(kustermann): We may need to change this return !hasTimedOut && exitCode == 0; } bool get successful { - // FIXME(kustermann): We may need to change this + // TODO(kustermann): We may need to change this return !hasTimedOut && exitCode == 0; } @@ -230,7 +230,7 @@ class BrowserTestJsonResult { return types.any((type) => messagesByType[type]!.contains(message)); } - // FIXME(kustermann,ricow): I think this functionality doesn't work in + // TODO(kustermann,ricow): I think this functionality doesn't work in // test_controller.js: So far I haven't seen anything being reported on // "window.compilationerror" if (occurred('window_compilationerror')) { diff --git a/runtime/observatory/lib/object_graph.dart b/runtime/observatory/lib/object_graph.dart index 684a5fcdd2e..dfa5ba1215f 100644 --- a/runtime/observatory/lib/object_graph.dart +++ b/runtime/observatory/lib/object_graph.dart @@ -930,17 +930,21 @@ class _SnapshotGraph implements SnapshotGraph { classes[0] = _SnapshotClass._new(this, 0, "Root", "", ""); for (var cid = 1; cid <= K; cid++) { + // ignore: unused_local_variable int flags = stream.readUnsigned(); String name = stream.readUtf8(); String libName = stream.readUtf8(); String libUri = stream.readUtf8(); + // ignore: unused_local_variable String reserved = stream.readUtf8(); final cls = _SnapshotClass._new(this, cid, name, libName, libUri); int edgeCount = stream.readUnsigned(); for (int i = 0; i < edgeCount; i++) { + // ignore: unused_local_variable int flags = stream.readUnsigned(); int index = stream.readUnsigned(); String fieldName = stream.readUtf8(); + // ignore: unused_local_variable String reserved = stream.readUtf8(); cls.fields[index] = fieldName; } @@ -1051,6 +1055,7 @@ class _SnapshotGraph implements SnapshotGraph { for (var i = 0; i < externalPropertyCount; i++) { final oid = stream.readUnsigned(); final externalSize = stream.readUnsigned(); + // ignore: unused_local_variable final name = stream.readUtf8(); externalSizes[oid] += externalSize; } diff --git a/runtime/observatory/lib/src/app/page.dart b/runtime/observatory/lib/src/app/page.dart index 270ab2cd0ee..6bb70a7be33 100644 --- a/runtime/observatory/lib/src/app/page.dart +++ b/runtime/observatory/lib/src/app/page.dart @@ -166,7 +166,7 @@ class VMPage extends MatchingPage { app.events, app.notifications, new IsolateRepository(app.vm), - new IsolateGroupRepository(app.vm), + new IsolateGroupRepository(), _scriptRepository, queue: app.queue) .element diff --git a/runtime/observatory/lib/src/elements/debugger.dart b/runtime/observatory/lib/src/elements/debugger.dart index b928352a8ae..05e84d70e03 100644 --- a/runtime/observatory/lib/src/elements/debugger.dart +++ b/runtime/observatory/lib/src/elements/debugger.dart @@ -2942,6 +2942,7 @@ class DebuggerConsoleElement extends CustomElement implements Renderable { DebuggerConsoleElement.created() : super.created('debugger-console'); /// Is [container] scrolled to the within [threshold] pixels of the bottom? + // ignore: unused_element static bool _isScrolledToBottom(DivElement? container, [int threshold = 2]) { if (container == null) { return false; diff --git a/runtime/observatory/lib/src/elements/heap_snapshot.dart b/runtime/observatory/lib/src/elements/heap_snapshot.dart index 49a09df57f9..9046c14b3ef 100644 --- a/runtime/observatory/lib/src/elements/heap_snapshot.dart +++ b/runtime/observatory/lib/src/elements/heap_snapshot.dart @@ -309,7 +309,6 @@ class SnapshotClassDiff { for (var classA in graphA.classes) { var classDiff = new SnapshotClassDiff(); var qualifiedName = classA.qualifiedName; - var name = classA.name; classDiff._a = classA; var classB = classesB[qualifiedName]; if (classB != null) { diff --git a/runtime/observatory/lib/src/elements/metric/graph.dart b/runtime/observatory/lib/src/elements/metric/graph.dart index c941c7bcbcc..6ba145d0f78 100644 --- a/runtime/observatory/lib/src/elements/metric/graph.dart +++ b/runtime/observatory/lib/src/elements/metric/graph.dart @@ -62,7 +62,6 @@ class MetricGraphElement extends CustomElement implements Renderable { message = 'min: $min, $message'; message = message + ', max: $max'; - final host = new DivElement(); children = [ new DivElement() ..classes = ['memberList'] diff --git a/runtime/observatory/lib/src/elements/persistent_handles.dart b/runtime/observatory/lib/src/elements/persistent_handles.dart index 43a2394c99a..30eef92c273 100644 --- a/runtime/observatory/lib/src/elements/persistent_handles.dart +++ b/runtime/observatory/lib/src/elements/persistent_handles.dart @@ -240,7 +240,7 @@ class PersistentHandlesPageElement extends CustomElement implements Renderable { ]; } - Future _refresh({bool gc = false, bool reset = false}) async { + Future _refresh() async { _handles = null; _r.dirty(); _handles = await _repository.get(_isolate); diff --git a/runtime/observatory/lib/src/repositories/isolate_group.dart b/runtime/observatory/lib/src/repositories/isolate_group.dart index 465ae541a12..8aaacc1f851 100644 --- a/runtime/observatory/lib/src/repositories/isolate_group.dart +++ b/runtime/observatory/lib/src/repositories/isolate_group.dart @@ -5,9 +5,7 @@ part of repositories; class IsolateGroupRepository extends M.IsolateGroupRepository { - final S.VM _vm; - - IsolateGroupRepository(this._vm); + IsolateGroupRepository(); Future get(M.IsolateGroupRef i) async { S.IsolateGroup isolateGroup = i as S.IsolateGroup; diff --git a/runtime/observatory/lib/src/repositories/timeline.dart b/runtime/observatory/lib/src/repositories/timeline.dart index f45ae746d8a..b90131ab23e 100644 --- a/runtime/observatory/lib/src/repositories/timeline.dart +++ b/runtime/observatory/lib/src/repositories/timeline.dart @@ -6,9 +6,6 @@ part of repositories; class TimelineRepository extends TimelineRepositoryBase implements M.TimelineRepository { - static const _kStackFrames = 'stackFrames'; - static const _kTraceEvents = 'traceEvents'; - Future getFlags(M.VMRef ref) async { S.VM vm = ref as S.VM; S.ServiceMap response = diff --git a/runtime/tools/dartfuzz/dartfuzz.dart b/runtime/tools/dartfuzz/dartfuzz.dart index 6de1861ae8b..2b73e2891ec 100644 --- a/runtime/tools/dartfuzz/dartfuzz.dart +++ b/runtime/tools/dartfuzz/dartfuzz.dart @@ -433,7 +433,7 @@ class DartApi { } } - final typeToLibraryMethods; + final Map> typeToLibraryMethods; } /// Class that generates a random, but runnable Dart program for fuzz testing. @@ -912,7 +912,7 @@ class DartFuzz { emitMethods(classMethods[currentClassIndex!]); emitFunctionDefinition('run', () { if (i > 0) { - // FIXME(bkonyi): fix potential issue where we try to apply a class + // TODO(bkonyi): fix potential issue where we try to apply a class // as a mixin when it calls super. emitLn('super.run();'); } @@ -1160,7 +1160,7 @@ class DartFuzz { // Emit a throw statement. bool emitThrow() { - var tp; + DartType tp; do { tp = oneOfSet(dartType.allTypes).toNonNullable(); } while (tp == DartType.NULL); @@ -1680,7 +1680,7 @@ class DartFuzz { } void emitCollection(int depth, DartType tp, {RhsFilter? rhsFilter}) { - var l, r; + String l, r; if (DartType.isListType(tp)) { var elementType = dartType.elementType(tp); l = '<${elementType.dartName}>['; @@ -1708,7 +1708,8 @@ class DartFuzz { } void emitConstCollection(int depth, DartType tp, {RhsFilter? rhsFilter}) { - var l, r, canHaveElements; + String l, r; + bool canHaveElements; if (DartType.isListType(tp)) { var elementType = dartType.elementType(tp); l = 'const <${elementType.dartName}>['; @@ -2504,12 +2505,13 @@ void main(List arguments) { help: 'Bitmask indicating which expressions to omit' '(Bit=1 omits)', defaultsTo: '0'); - var results; + final ArgResults results; try { results = parser.parse(arguments); } catch (e) { print('Usage: dart dartfuzz.dart [OPTIONS] FILENAME\n${parser.usage}\n$e'); exitCode = 255; + return; } final seed = getSeed(results[kSeed]); final fp = results[kFp]; diff --git a/runtime/tools/dartfuzz/dartfuzz_api_table.dart b/runtime/tools/dartfuzz/dartfuzz_api_table.dart index 4b59975134d..a56a9f7b6bb 100644 --- a/runtime/tools/dartfuzz/dartfuzz_api_table.dart +++ b/runtime/tools/dartfuzz/dartfuzz_api_table.dart @@ -2,7 +2,7 @@ // 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. -/// NOTE: this code has been generated automatically. +// NOTE: this code has been generated automatically. import 'dartfuzz_type_table.dart'; diff --git a/runtime/tools/dartfuzz/dartfuzz_test.dart b/runtime/tools/dartfuzz/dartfuzz_test.dart index 943ca1042bb..c38a33f794c 100644 --- a/runtime/tools/dartfuzz/dartfuzz_test.dart +++ b/runtime/tools/dartfuzz/dartfuzz_test.dart @@ -2,6 +2,8 @@ // 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. +// ignore_for_file: non_constant_identifier_names + import 'dart:io'; import 'dart:isolate'; import 'dart:math'; @@ -756,7 +758,7 @@ void main(List arguments) { help: 'path to output (ignored)', defaultsTo: null); // Starts fuzz testing session. - var results; + ArgResults results; try { results = parser.parse(arguments); } catch (e) { diff --git a/runtime/tools/dartfuzz/gen_type_table.dart b/runtime/tools/dartfuzz/gen_type_table.dart index 0a61e03d0d7..cba58ee5bdd 100644 --- a/runtime/tools/dartfuzz/gen_type_table.dart +++ b/runtime/tools/dartfuzz/gen_type_table.dart @@ -1137,9 +1137,9 @@ void analyzeTypes(Set allTypes) { } // Group current type with their respective type group. - if (iTyp.name == 'Set') setTypes.add(typName); - if (iTyp.name == 'List') listTypes.add(typName); - if (iTyp.name == 'Map') mapTypes.add(typName); + if (iTyp.element.name == 'Set') setTypes.add(typName); + if (iTyp.element.name == 'List') listTypes.add(typName); + if (iTyp.element.name == 'Map') mapTypes.add(typName); if (iTyp.typeArguments.length == 1) { // Analyze Array, List and Set types. @@ -1190,11 +1190,12 @@ void getParameterizedTypes( // Out: types with no parameters. for (var tp in allTypes) { if (tp.typeArguments.length == 1 && - (tp.typeArguments[0].name == 'E' || tp.typeArguments[0].name == 'T')) { + (tp.typeArguments[0].element?.name == 'E' || + tp.typeArguments[0].element?.name == 'T')) { pTypes1.add(tp); } else if (tp.typeArguments.length == 2 && - tp.typeArguments[0].name == 'K' && - tp.typeArguments[1].name == 'V') { + tp.typeArguments[0].element?.name == 'K' && + tp.typeArguments[1].element?.name == 'V') { pTypes2.add(tp); } else { iTypes.add(tp); diff --git a/runtime/tools/dartfuzz/gen_util.dart b/runtime/tools/dartfuzz/gen_util.dart index d1a212d26ad..fc0211a7f60 100644 --- a/runtime/tools/dartfuzz/gen_util.dart +++ b/runtime/tools/dartfuzz/gen_util.dart @@ -23,11 +23,11 @@ class GenUtil { } // Create an analyzer session. - static AnalysisSession createAnalysisSession([String? dart_top]) { + static AnalysisSession createAnalysisSession([String? dartTop]) { // Set paths. Note that for this particular use case, packageRoot can be // any directory. Here, we set it to the top of the SDK development, and // derive the required sdkPath from there. - final packageRoot = getTop(dart_top); + final packageRoot = getTop(dartTop); final sdkPath = '$packageRoot/sdk'; // This does most of the hard work of getting the analyzer configured diff --git a/runtime/tools/ffi/sdk_lib_ffi_generator.dart b/runtime/tools/ffi/sdk_lib_ffi_generator.dart index 41a6c3f228a..4e6294b69d0 100644 --- a/runtime/tools/ffi/sdk_lib_ffi_generator.dart +++ b/runtime/tools/ffi/sdk_lib_ffi_generator.dart @@ -7,6 +7,8 @@ // The PointerPointer and PointerStruct extension are written by hand since // those are not repetitive. +// ignore_for_file: unused_local_variable + import 'dart:io'; import 'package:args/args.dart'; diff --git a/sdk.code-workspace b/sdk.code-workspace index 8cb43c4978f..0ea8b9a73cd 100644 --- a/sdk.code-workspace +++ b/sdk.code-workspace @@ -60,6 +60,10 @@ "third_party", "runtime/third_party", + // This package depends on a package that will not be brought in as a + // dart-sdk dep. https://github.com/dart-lang/sdk/issues/50061 + "runtime/tools/heapsnapshot", + // We probably can include 'lib', but it currently shows too many errors. // We would need to ignore import_internal_library, and other warnings // on a per-file basis, since the analyzer is designed to work with