Skip to content

Commit f0d0a1d

Browse files
bkonyidart-scoped@luci-project-accounts.iam.gserviceaccount.com
authored andcommitted
[frontend_server] Handle unreachable libraries during web incremental compilation
When a file outside the entrypoint graph (e.g. an unimported file or standalone helper) is edited during hot reload, CFE includes it in the partial component. Because StrongComponents only computes library bundles for libraries reachable from the entrypoint, looking up the unreachable library in libraryImportToLibraryBundleImport returned null, triggering a 'Null check operator used on a null value' crash. This change safely ignores libraries not present in the strong components mapping during invalidation and skips compilation for them. Fixes flutter/flutter#192227 Change-Id: I47e3deb1b35dc4e9b4d1fcb1050a144886e4fa65 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/545300 Reviewed-by: Jens Johansen <[email protected]> Commit-Queue: Ben Konyi <[email protected]>
1 parent 84c89df commit f0d0a1d

2 files changed

Lines changed: 109 additions & 4 deletions

File tree

‎pkg/frontend_server/lib/src/javascript_bundle.dart‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ class IncrementalJavaScriptBundler {
144144
});
145145
invalidatedLibraryUris = <Uri>{
146146
for (Library library in partialComponent.libraries)
147-
_strongComponents.libraryImportToLibraryBundleImport[library
148-
.importUri]!,
147+
?_strongComponents.libraryImportToLibraryBundleImport[library
148+
.importUri],
149149
};
150150
} else {
151151
invalidatedLibraryUris = partialComponent.libraries.map(
@@ -266,10 +266,14 @@ class IncrementalJavaScriptBundler {
266266
continue;
267267
}
268268

269-
final Uri libraryOrLibraryBundleImportUri = useStronglyConnectedComponents
269+
final Uri? libraryOrLibraryBundleImportUri =
270+
useStronglyConnectedComponents
270271
? _strongComponents.libraryImportToLibraryBundleImport[library
271-
.importUri]!
272+
.importUri]
272273
: library.importUri;
274+
if (libraryOrLibraryBundleImportUri == null) {
275+
continue;
276+
}
273277
if (visited.containsKey(libraryOrLibraryBundleImportUri)) {
274278
kernel2JsCompilers[library.importUri.toString()] =
275279
visited[libraryOrLibraryBundleImportUri]!;

‎pkg/frontend_server/test/src/javascript_bundle_test.dart‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,107 @@ void main() {
686686
// C source code should be updated.
687687
expect(code, contains('AlternativeContents'));
688688
});
689+
690+
test('handles unreachable libraries in invalidation and compile', () async {
691+
final Uri uriC = new Uri.file('/c.dart');
692+
final Library libraryC = new Library(
693+
uriC,
694+
fileUri: uriC,
695+
procedures: [
696+
new Procedure(
697+
new Name('CheckForContents'),
698+
ProcedureKind.Method,
699+
new FunctionNode(new Block([])),
700+
fileUri: uriC,
701+
),
702+
],
703+
);
704+
final Uri uriA = new Uri.file('/a.dart');
705+
final Library libraryA = new Library(
706+
uriA,
707+
fileUri: uriA,
708+
dependencies: [new LibraryDependency.import(libraryC)],
709+
procedures: [
710+
new Procedure(
711+
new Name('ArbitrarilyChosen'),
712+
ProcedureKind.Method,
713+
new FunctionNode(new Block([])),
714+
fileUri: uriA,
715+
),
716+
],
717+
);
718+
final Component testComponent = new Component(
719+
libraries: [libraryA, libraryC, ...testCoreLibraries],
720+
);
721+
722+
final IncrementalJavaScriptBundler javaScriptBundler =
723+
new IncrementalJavaScriptBundler(null, {}, multiRootScheme);
724+
725+
await javaScriptBundler.initialize(testComponent, uriA, packageConfig);
726+
727+
// Create an unreachable library D that is not imported by the entrypoint A.
728+
final Uri uriD = new Uri.file('/d.dart');
729+
final Library libraryD = new Library(
730+
uriD,
731+
fileUri: uriD,
732+
procedures: [
733+
new Procedure(
734+
new Name('UnreachableMethod'),
735+
ProcedureKind.Method,
736+
new FunctionNode(new Block([])),
737+
fileUri: uriD,
738+
),
739+
],
740+
);
741+
742+
// Create updated C and unreachable D.
743+
final Library libraryC2 = new Library(
744+
uriC,
745+
fileUri: uriC,
746+
procedures: [
747+
new Procedure(
748+
new Name('AlternativeContents'),
749+
ProcedureKind.Method,
750+
new FunctionNode(new Block([])),
751+
fileUri: uriC,
752+
),
753+
],
754+
);
755+
756+
final Component partialComponent = new Component(
757+
libraries: [libraryC2, libraryD],
758+
);
759+
760+
await javaScriptBundler.invalidate(
761+
partialComponent,
762+
testComponent,
763+
uriA,
764+
packageConfig,
765+
recompileRestart: false,
766+
);
767+
768+
final _MemorySink manifestSink = new _MemorySink();
769+
final _MemorySink codeSink = new _MemorySink();
770+
final _MemorySink sourcemapSink = new _MemorySink();
771+
final _MemorySink metadataSink = new _MemorySink();
772+
final _MemorySink symbolsSink = new _MemorySink();
773+
final CoreTypes coreTypes = new CoreTypes(testComponent);
774+
775+
await javaScriptBundler.compile(
776+
new ClassHierarchy(testComponent, coreTypes),
777+
coreTypes,
778+
packageConfig,
779+
codeSink,
780+
manifestSink,
781+
sourcemapSink,
782+
metadataSink,
783+
symbolsSink,
784+
);
785+
786+
final String code = utf8.decode(codeSink.buffer);
787+
expect(code, contains('AlternativeContents'));
788+
expect(code, isNot(contains('UnreachableMethod')));
789+
});
689790
}
690791

691792
class _MemorySink implements IOSink {

0 commit comments

Comments
 (0)