Attempt to work around repeating LinkedBundleContext exceptions.

scheglov · commit-bot@chromium.org · commit b716efbfc026 · 2019-11-18T19:10:13.000Z
R=brianwilkerson@google.com, devoncarew@google.com Change-Id: I4dd52770d2cc128ebfb82f49fe52d7d83ed65a9b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125562 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -946,6 +946,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {
         _requestedFiles.remove(path).forEach((completer) {
           completer.completeError(exception, stackTrace);
         });
+        _clearLibraryContextAfterException();
       }
       return;
     }
@@ -962,6 +963,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {
         _requestedLibraries.remove(path).forEach((completer) {
           completer.completeError(exception, stackTrace);
         });
+        _clearLibraryContextAfterException();
       }
       return;
     }
@@ -1052,6 +1054,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {
             }
           } catch (exception, stackTrace) {
             _reportException(path, exception, stackTrace);
+            _clearLibraryContextAfterException();
           } finally {
             _fileTracker.fileWasAnalyzed(path);
           }
@@ -1077,6 +1080,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {
         }
       } catch (exception, stackTrace) {
         _reportException(path, exception, stackTrace);
+        _clearLibraryContextAfterException();
       } finally {
         _fileTracker.fileWasAnalyzed(path);
       }
@@ -1101,6 +1105,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {
         _requestedParts.remove(path).forEach((completer) {
           completer.completeError(exception, stackTrace);
         });
+        _clearLibraryContextAfterException();
       }
       return;
     }
@@ -1116,6 +1121,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {
         _resultController.add(result);
       } catch (exception, stackTrace) {
         _reportException(path, exception, stackTrace);
+        _clearLibraryContextAfterException();
       }
       return;
     }
@@ -1182,6 +1188,14 @@ class AnalysisDriver implements AnalysisDriverGeneric {
     _scheduler.notify(this);
   }
 
+  /// There was an exception during a file analysis, we don't know why.
+  /// But it might have been caused by an inconsistency of files state, and
+  /// the library context state. Reset the library context, and hope that
+  /// we will solve the inconsistency while loading / building summaries.
+  void _clearLibraryContextAfterException() {
+    _libraryContext = null;
+  }
+
   /// Return the cached or newly computed analysis result of the file with the
   /// given [path].
   ///

Original file line number	Diff line number	Diff line change
`@@ -946,6 +946,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {`
`946`	`946`	`_requestedFiles.remove(path).forEach((completer) {`
`947`	`947`	`completer.completeError(exception, stackTrace);`
`948`	`948`	`});`
	`949`	`+ _clearLibraryContextAfterException();`
`949`	`950`	`}`
`950`	`951`	`return;`
`951`	`952`	`}`
`@@ -962,6 +963,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {`
`962`	`963`	`_requestedLibraries.remove(path).forEach((completer) {`
`963`	`964`	`completer.completeError(exception, stackTrace);`
`964`	`965`	`});`
	`966`	`+ _clearLibraryContextAfterException();`
`965`	`967`	`}`
`966`	`968`	`return;`
`967`	`969`	`}`
`@@ -1052,6 +1054,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {`
`1052`	`1054`	`}`
`1053`	`1055`	`} catch (exception, stackTrace) {`
`1054`	`1056`	`_reportException(path, exception, stackTrace);`
	`1057`	`+ _clearLibraryContextAfterException();`
`1055`	`1058`	`} finally {`
`1056`	`1059`	`_fileTracker.fileWasAnalyzed(path);`
`1057`	`1060`	`}`
`@@ -1077,6 +1080,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {`
`1077`	`1080`	`}`
`1078`	`1081`	`} catch (exception, stackTrace) {`
`1079`	`1082`	`_reportException(path, exception, stackTrace);`
	`1083`	`+ _clearLibraryContextAfterException();`
`1080`	`1084`	`} finally {`
`1081`	`1085`	`_fileTracker.fileWasAnalyzed(path);`
`1082`	`1086`	`}`
`@@ -1101,6 +1105,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {`
`1101`	`1105`	`_requestedParts.remove(path).forEach((completer) {`
`1102`	`1106`	`completer.completeError(exception, stackTrace);`
`1103`	`1107`	`});`
	`1108`	`+ _clearLibraryContextAfterException();`
`1104`	`1109`	`}`
`1105`	`1110`	`return;`
`1106`	`1111`	`}`
`@@ -1116,6 +1121,7 @@ class AnalysisDriver implements AnalysisDriverGeneric {`
`1116`	`1121`	`_resultController.add(result);`
`1117`	`1122`	`} catch (exception, stackTrace) {`
`1118`	`1123`	`_reportException(path, exception, stackTrace);`
	`1124`	`+ _clearLibraryContextAfterException();`
`1119`	`1125`	`}`
`1120`	`1126`	`return;`
`1121`	`1127`	`}`
`@@ -1182,6 +1188,14 @@ class AnalysisDriver implements AnalysisDriverGeneric {`
`1182`	`1188`	`_scheduler.notify(this);`
`1183`	`1189`	`}`
`1184`	`1190`
	`1191`	`+ /// There was an exception during a file analysis, we don't know why.`
	`1192`	`+ /// But it might have been caused by an inconsistency of files state, and`
	`1193`	`+ /// the library context state. Reset the library context, and hope that`
	`1194`	`+ /// we will solve the inconsistency while loading / building summaries.`
	`1195`	`+ void _clearLibraryContextAfterException() {`
	`1196`	`+ _libraryContext = null;`
	`1197`	`+ }`
	`1198`	`+`
`1185`	`1199`	`/// Return the cached or newly computed analysis result of the file with the`
`1186`	`1200`	`/// given [path].`
`1187`	`1201`	`///`