Jens Johansen
9f9da91b84
The "additionalExports" are sorted in production code to give stable output. Before this CL it did `toString()` on the canonical names which is O(n^2) because of continued string concatenation. This CL changes it to sort on the name, going to the parent if it's the same. This _does_ change the sorting, but should still be stable. When compiling via the flutter frontend try bot the time spent on sorting does from ~45 seconds to ~9 seconds (arguable still a lot, but much better). This will also speed up flutter testing because it will spend less time waiting for the frontend. TEST=Assuming existing tests. Change-Id: If350b7c2ce49f00b2924732a7fa7eb51c38c8172 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/322280 Reviewed-by: Johnni Winther <johnniwinther@google.com> Reviewed-by: Alexander Markov <alexmarkov@google.com> Commit-Queue: Jens Johansen <jensj@google.com>
118 lines
3.2 KiB
Dart
118 lines
3.2 KiB
Dart
// Copyright (c) 2018, 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:convert' show utf8;
|
|
|
|
import "package:front_end/src/api_prototype/file_system.dart" show FileSystem;
|
|
|
|
import 'package:front_end/src/fasta/kernel/utils.dart' show serializeComponent;
|
|
|
|
import 'package:kernel/kernel.dart'
|
|
show
|
|
Class,
|
|
Component,
|
|
EmptyStatement,
|
|
FileUriNode,
|
|
Library,
|
|
Node,
|
|
Procedure,
|
|
RecursiveVisitor;
|
|
|
|
List<int> postProcess(Component c) {
|
|
postProcessComponent(c);
|
|
return serializeComponent(c);
|
|
}
|
|
|
|
void postProcessComponent(Component c) {
|
|
c.libraries.sort((l1, l2) {
|
|
return "${l1.fileUri}".compareTo("${l2.fileUri}");
|
|
});
|
|
|
|
c.problemsAsJson?.sort();
|
|
|
|
c.computeCanonicalNames();
|
|
for (Library library in c.libraries) {
|
|
library.additionalExports.sort();
|
|
library.problemsAsJson?.sort();
|
|
}
|
|
}
|
|
|
|
void throwOnEmptyMixinBodies(Component component) {
|
|
int empty = countEmptyMixinBodies(component);
|
|
if (empty != 0) {
|
|
throw "Expected 0 empty bodies in mixins, but found $empty";
|
|
}
|
|
}
|
|
|
|
int countEmptyMixinBodies(Component component) {
|
|
int empty = 0;
|
|
for (Library lib in component.libraries) {
|
|
for (Class c in lib.classes) {
|
|
if (c.isAnonymousMixin) {
|
|
for (Procedure p in c.procedures) {
|
|
if (p.function.body is EmptyStatement) {
|
|
empty++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return empty;
|
|
}
|
|
|
|
Future<void> throwOnInsufficientUriToSource(Component component,
|
|
{FileSystem? fileSystem}) async {
|
|
UriFinder uriFinder = new UriFinder();
|
|
component.accept(uriFinder);
|
|
Set<Uri> uris = uriFinder.seenUris.toSet();
|
|
uris.removeAll(component.uriToSource.keys);
|
|
uris.remove(null);
|
|
if (uris.length != 0) {
|
|
throw "Expected 0 uris with no source, but found ${uris.length} ($uris)";
|
|
}
|
|
|
|
if (fileSystem != null) {
|
|
uris = uriFinder.seenUris.toSet();
|
|
for (Uri uri in uris) {
|
|
if (!uri.isScheme("org-dartlang-test")) continue;
|
|
// The file system doesn't have the sources for any modules.
|
|
// For now assume that that is always what's going on.
|
|
if (!await fileSystem.entityForUri(uri).exists()) continue;
|
|
List<int> expected = await fileSystem.entityForUri(uri).readAsBytes();
|
|
List<int> actual = component.uriToSource[uri]!.source;
|
|
bool fail = false;
|
|
if (expected.length != actual.length) {
|
|
fail = true;
|
|
}
|
|
if (!fail) {
|
|
for (int i = 0; i < expected.length; i++) {
|
|
if (expected[i] != actual[i]) {
|
|
fail = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (fail) {
|
|
String expectedString = utf8.decode(expected);
|
|
String actualString = utf8.decode(actual);
|
|
throw "Not expected source for $uri:\n\n"
|
|
"$expectedString\n\n"
|
|
"vs\n\n"
|
|
"$actualString";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
class UriFinder extends RecursiveVisitor {
|
|
Set<Uri> seenUris = new Set<Uri>();
|
|
@override
|
|
void defaultNode(Node node) {
|
|
super.defaultNode(node);
|
|
if (node is FileUriNode) {
|
|
seenUris.add(node.fileUri);
|
|
}
|
|
}
|
|
}
|