From d4aef249b4e834bb37b95981ca8eda79d8aae1f2 Mon Sep 17 00:00:00 2001 From: Konstantin Shcheglov Date: Fri, 14 May 2021 17:12:38 +0000 Subject: [PATCH] Fix using deprecated AnalysisSession APIs in dartfuzz. Change-Id: I1d4ae47de90aa1465b009960e75de68ab3a9a317 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/199880 Commit-Queue: Konstantin Shcheglov Reviewed-by: Ben Konyi --- runtime/tools/dartfuzz/gen_api_table.dart | 7 ++++--- runtime/tools/dartfuzz/gen_type_table.dart | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/runtime/tools/dartfuzz/gen_api_table.dart b/runtime/tools/dartfuzz/gen_api_table.dart index 387341b10ae..cd0ecadc348 100644 --- a/runtime/tools/dartfuzz/gen_api_table.dart +++ b/runtime/tools/dartfuzz/gen_api_table.dart @@ -330,11 +330,12 @@ void main() async { Future visitLibraryAtUri(AnalysisSession session, String uri) async { final libPath = session.uriConverter.uriToPath(Uri.parse(uri)); - var result = await session.getResolvedLibrary(libPath); - if (result.state != ResultState.VALID) { + var result = await session.getResolvedLibrary2(libPath); + if (result is ResolvedLibraryResult) { + visitLibrary(result.element); + } else { throw StateError('Unable to resolve "$uri"'); } - visitLibrary(result.element); } void visitLibrary(LibraryElement library) { diff --git a/runtime/tools/dartfuzz/gen_type_table.dart b/runtime/tools/dartfuzz/gen_type_table.dart index a683504fc50..20010881864 100644 --- a/runtime/tools/dartfuzz/gen_type_table.dart +++ b/runtime/tools/dartfuzz/gen_type_table.dart @@ -1268,11 +1268,12 @@ Future getDataTypes(Set allTypes, String dartTop) async { Future visitLibraryAtUri( AnalysisSession session, String uri, Set allTypes) async { var libPath = session.uriConverter.uriToPath(Uri.parse(uri)); - var result = await session.getResolvedLibrary(libPath); - if (result.state != ResultState.VALID) { + var result = await session.getResolvedLibrary2(libPath); + if (result is ResolvedLibraryResult) { + visitLibrary(result.element, allTypes); + } else { throw StateError('Unable to resolve "$uri"'); } - visitLibrary(result.element, allTypes); } void visitLibrary(LibraryElement library, Set allTypes) {