Version 2.19.0-402.0.dev

Merge c6d69f1 into dev
skia-flutter-autoroll · Nov 15, 2022 · 09be43f · 09be43f
2 parents 42f87c0 + c6d69f1
commit 09be43f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -102,8 +102,8 @@ tools/xcodebuild
 /crash_logs/
 /build/config/gclient_args.gni
 /pkg/front_end/testcases/old_dills/
-/logs.json
-/results.json
+logs/logs.json
+logs/results.json
 /async_lazy_debug.so
 /dwarf.so
 /dwarf_obfuscate.so

diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
@@ -2186,7 +2186,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
         debugName: "extension $name",
         isModifiable: false);
 
-    Extension? referenceFrom = referencesFromIndexed?.lookupExtension(name);
+    View? referenceFrom = referencesFromIndexed?.lookupView(name);
 
     ViewBuilder viewBuilder = new SourceViewBuilder(
         metadata,

diff --git a/pkg/front_end/lib/src/fasta/source/source_view_builder.dart b/pkg/front_end/lib/src/fasta/source/source_view_builder.dart
@@ -43,7 +43,7 @@ class SourceViewBuilder extends ViewBuilderImpl
       int startOffset,
       int nameOffset,
       int endOffset,
-      Extension? referenceFrom)
+      View? referenceFrom)
       : _view = new View(
             name: name,
             fileUri: parent.fileUri,

diff --git a/pkg/front_end/test/fasta/testing/suite.dart b/pkg/front_end/test/fasta/testing/suite.dart
@@ -1492,7 +1492,11 @@ class FuzzCompiles
         print("Skipping $uri -- couldn't find builder for it.");
         continue;
       }
-      Uint8List orgData = fs.data[uri] as Uint8List;
+      Uint8List? orgData = fs.data[uri];
+      if (orgData == null) {
+        print("Skipping $uri -- couldn't find source for it.");
+        continue;
+      }
       FuzzAstVisitorSorter fuzzAstVisitorSorter;
       try {
         fuzzAstVisitorSorter =

diff --git a/pkg/front_end/testcases/weak.status b/pkg/front_end/testcases/weak.status
@@ -17,8 +17,9 @@ general/issue48765: semiFuzzFailureOnForceRebuildBodies # private class
 general/mixin_from_patch/main: semiFuzzFailureOnForceRebuildBodies # needs custom libraries.json (and platform?) not setup here
 general/multiple_class_patches/main: semiFuzzFailureOnForceRebuildBodies # needs custom libraries.json (and platform?) not setup here
 general/no_such_method_forwarder: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/242444
+general/sealed_class_declaration: SemiFuzzFailure # "sealed" experimental feature.
 general/tear_off_patch/main: semiFuzzFailureOnForceRebuildBodies # needs custom libraries.json (and platform?) not setup here
-general/view_class_declaration: SemiFuzzFailure # "view" doesn't appear to get into the reordering.
+general/view_class_declaration: SemiFuzzFailure # "view" doesn't appear to get into the reordering (experimental feature).
 general/with_dependencies/issue_43084/issue_43084: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/242543
 inference_update_1/horizontal_inference_extension_method: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/245004
 inference_update_1/horizontal_inference_extension_method: semiFuzzFailureOnForceRebuildBodies # Errors on split

diff --git a/pkg/kernel/lib/reference_from_index.dart b/pkg/kernel/lib/reference_from_index.dart
@@ -15,7 +15,8 @@ import "ast.dart"
         Procedure,
         ProcedureKind,
         Reference,
-        Typedef;
+        Typedef,
+        View;
 
 class ReferenceFromIndex {
   Map<Library, IndexedLibrary> _indexedLibraries =
@@ -84,6 +85,7 @@ class IndexedLibrary extends IndexedContainer {
   final Map<String, IndexedClass> _indexedClasses =
       new Map<String, IndexedClass>();
   final Map<String, Extension> _extensions = new Map<String, Extension>();
+  final Map<String, View> _views = new Map<String, View>();
   @override
   final Library library;
 
@@ -110,6 +112,11 @@ class IndexedLibrary extends IndexedContainer {
         _extensions[extension.name] = extension;
       }
     }
+    for (int i = 0; i < library.views.length; i++) {
+      View view = library.views[i];
+      assert(_views[view.name] == null);
+      _views[view.name] = view;
+    }
     _addProcedures(library.procedures);
     _addFields(library.fields);
 
@@ -137,6 +144,7 @@ class IndexedLibrary extends IndexedContainer {
   Class? lookupClass(String name) => _classes[name];
   IndexedClass? lookupIndexedClass(String name) => _indexedClasses[name];
   Extension? lookupExtension(String name) => _extensions[name];
+  View? lookupView(String name) => _views[name];
 }
 
 class IndexedClass extends IndexedContainer {

diff --git a/pkg/test_runner/lib/src/test_progress.dart b/pkg/test_runner/lib/src/test_progress.dart
@@ -635,7 +635,9 @@ class ResultWriter extends EventListener {
   final List<Map> _logs = [];
   final String _outputDirectory;
 
-  ResultWriter(this._outputDirectory);
+  ResultWriter(this._outputDirectory) {
+    Directory(_outputDirectory).createSync(recursive: true);
+  }
 
   void allTestsKnown() {
     // Write an empty result log file, that will be overwritten if any tests

diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 19
 PATCH 0
-PRERELEASE 401
+PRERELEASE 402
 PRERELEASE_PATCH 0