Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 09be43f

Browse files
author
Dart CI
committed
Version 2.19.0-402.0.dev
Merge c6d69f1 into dev
2 parents 42f87c0 + c6d69f1 commit 09be43f

File tree

8 files changed

+24
-9
lines changed

8 files changed

+24
-9
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ tools/xcodebuild
102102
/crash_logs/
103103
/build/config/gclient_args.gni
104104
/pkg/front_end/testcases/old_dills/
105-
/logs.json
106-
/results.json
105+
logs/logs.json
106+
logs/results.json
107107
/async_lazy_debug.so
108108
/dwarf.so
109109
/dwarf_obfuscate.so

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2186,7 +2186,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
21862186
debugName: "extension $name",
21872187
isModifiable: false);
21882188

2189-
Extension? referenceFrom = referencesFromIndexed?.lookupExtension(name);
2189+
View? referenceFrom = referencesFromIndexed?.lookupView(name);
21902190

21912191
ViewBuilder viewBuilder = new SourceViewBuilder(
21922192
metadata,

pkg/front_end/lib/src/fasta/source/source_view_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class SourceViewBuilder extends ViewBuilderImpl
4343
int startOffset,
4444
int nameOffset,
4545
int endOffset,
46-
Extension? referenceFrom)
46+
View? referenceFrom)
4747
: _view = new View(
4848
name: name,
4949
fileUri: parent.fileUri,

pkg/front_end/test/fasta/testing/suite.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1492,7 +1492,11 @@ class FuzzCompiles
14921492
print("Skipping $uri -- couldn't find builder for it.");
14931493
continue;
14941494
}
1495-
Uint8List orgData = fs.data[uri] as Uint8List;
1495+
Uint8List? orgData = fs.data[uri];
1496+
if (orgData == null) {
1497+
print("Skipping $uri -- couldn't find source for it.");
1498+
continue;
1499+
}
14961500
FuzzAstVisitorSorter fuzzAstVisitorSorter;
14971501
try {
14981502
fuzzAstVisitorSorter =

pkg/front_end/testcases/weak.status

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ general/issue48765: semiFuzzFailureOnForceRebuildBodies # private class
1717
general/mixin_from_patch/main: semiFuzzFailureOnForceRebuildBodies # needs custom libraries.json (and platform?) not setup here
1818
general/multiple_class_patches/main: semiFuzzFailureOnForceRebuildBodies # needs custom libraries.json (and platform?) not setup here
1919
general/no_such_method_forwarder: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/242444
20+
general/sealed_class_declaration: SemiFuzzFailure # "sealed" experimental feature.
2021
general/tear_off_patch/main: semiFuzzFailureOnForceRebuildBodies # needs custom libraries.json (and platform?) not setup here
21-
general/view_class_declaration: SemiFuzzFailure # "view" doesn't appear to get into the reordering.
22+
general/view_class_declaration: SemiFuzzFailure # "view" doesn't appear to get into the reordering (experimental feature).
2223
general/with_dependencies/issue_43084/issue_43084: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/242543
2324
inference_update_1/horizontal_inference_extension_method: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/245004
2425
inference_update_1/horizontal_inference_extension_method: semiFuzzFailureOnForceRebuildBodies # Errors on split

pkg/kernel/lib/reference_from_index.dart

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import "ast.dart"
1515
Procedure,
1616
ProcedureKind,
1717
Reference,
18-
Typedef;
18+
Typedef,
19+
View;
1920

2021
class ReferenceFromIndex {
2122
Map<Library, IndexedLibrary> _indexedLibraries =
@@ -84,6 +85,7 @@ class IndexedLibrary extends IndexedContainer {
8485
final Map<String, IndexedClass> _indexedClasses =
8586
new Map<String, IndexedClass>();
8687
final Map<String, Extension> _extensions = new Map<String, Extension>();
88+
final Map<String, View> _views = new Map<String, View>();
8789
@override
8890
final Library library;
8991

@@ -110,6 +112,11 @@ class IndexedLibrary extends IndexedContainer {
110112
_extensions[extension.name] = extension;
111113
}
112114
}
115+
for (int i = 0; i < library.views.length; i++) {
116+
View view = library.views[i];
117+
assert(_views[view.name] == null);
118+
_views[view.name] = view;
119+
}
113120
_addProcedures(library.procedures);
114121
_addFields(library.fields);
115122

@@ -137,6 +144,7 @@ class IndexedLibrary extends IndexedContainer {
137144
Class? lookupClass(String name) => _classes[name];
138145
IndexedClass? lookupIndexedClass(String name) => _indexedClasses[name];
139146
Extension? lookupExtension(String name) => _extensions[name];
147+
View? lookupView(String name) => _views[name];
140148
}
141149

142150
class IndexedClass extends IndexedContainer {

pkg/test_runner/lib/src/test_progress.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,9 @@ class ResultWriter extends EventListener {
635635
final List<Map> _logs = [];
636636
final String _outputDirectory;
637637

638-
ResultWriter(this._outputDirectory);
638+
ResultWriter(this._outputDirectory) {
639+
Directory(_outputDirectory).createSync(recursive: true);
640+
}
639641

640642
void allTestsKnown() {
641643
// Write an empty result log file, that will be overwritten if any tests

tools/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ CHANNEL dev
2727
MAJOR 2
2828
MINOR 19
2929
PATCH 0
30-
PRERELEASE 401
30+
PRERELEASE 402
3131
PRERELEASE_PATCH 0

0 commit comments

Comments
 (0)