commit ac99b68c00d3d1330831fae48eed6f17658405e0
author Jens Johansen <jensj@google.com> Tue Jan 08 13:19:15 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Tue Jan 08 13:19:15 2019 +0000
tree 84dda09328ebd5377b596b4f91a8875c9ee922bf
parent 199fdb4d9ea5fdbbae99d81543edecb1a082b380

Don't catch call to buildOutlines

This was meant to be a bandage until a real fix landed
(which it did a few days after the 'fix' landed).
While it might still 'fix' something, it also does so silently meaning
that we won't ever catch it if we keep this try block.

Change-Id: I12b69ca06accd0b3fd3c51e2c292e61157c40f71
Reviewed-on: https://dart-review.googlesource.com/c/88571
Commit-Queue: Jens Johansen <jensj@google.com>
Reviewed-by: Peter von der Ahé <ahe@google.com>

pkg/front_end/lib/src/fasta/incremental_compiler.dart

diff --git a/pkg/front_end/lib/src/fasta/incremental_compiler.dart b/pkg/front_end/lib/src/fasta/incremental_compiler.dart
index e4fd12d..91a78a6 100644
--- a/pkg/front_end/lib/src/fasta/incremental_compiler.dart
+++ b/pkg/front_end/lib/src/fasta/incremental_compiler.dart
@@ -152,18 +152,7 @@
         }
         appendLibraries(data, bytesLength);
 
-        try {
-          await dillLoadedData.buildOutlines();
-        } catch (e) {
-          if (!initializedFromDill) rethrow;
-
-          // Retry without initializing from dill.
-          initializedFromDill = false;
-          data.reset();
-          bytesLength = prepareSummary(summaryBytes, uriTranslator, c, data);
-          appendLibraries(data, bytesLength);
-          await dillLoadedData.buildOutlines();
-        }
+        await dillLoadedData.buildOutlines();
         summaryBytes = null;
         userBuilders = <Uri, LibraryBuilder>{};
         platformBuilders = <LibraryBuilder>[];
@@ -689,17 +678,7 @@
 }
 
 class IncrementalCompilerData {
-  bool includeUserLoadedLibraries;
-  Procedure userLoadedUriMain;
-  Component component;
-
-  IncrementalCompilerData() {
-    reset();
-  }
-
-  reset() {
-    includeUserLoadedLibraries = false;
-    userLoadedUriMain = null;
-    component = null;
-  }
+  bool includeUserLoadedLibraries = false;
+  Procedure userLoadedUriMain = null;
+  Component component = null;
 }