Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Unified Diff: pkg/analyzer/lib/src/summary/package_bundle_reader.dart

Issue 1946723002: Fix bug in summary deserialization (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/summary/summary_sdk.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/summary/package_bundle_reader.dart
diff --git a/pkg/analyzer/lib/src/summary/package_bundle_reader.dart b/pkg/analyzer/lib/src/summary/package_bundle_reader.dart
index e765fae3048d9632b4d310adf45b24e824dd20c1..0bf66f1ae67efcb6e50d24ff90ea520092fa61b3 100644
--- a/pkg/analyzer/lib/src/summary/package_bundle_reader.dart
+++ b/pkg/analyzer/lib/src/summary/package_bundle_reader.dart
@@ -3,6 +3,7 @@ import 'dart:io' as io;
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/context/cache.dart';
import 'package:analyzer/src/context/context.dart';
+import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/java_io.dart';
import 'package:analyzer/src/generated/resolver.dart';
@@ -86,6 +87,37 @@ class InputPackagesResultProvider extends ResultProvider {
}
return false;
}
+ } else if (target is LibrarySpecificUnit) {
+ String uriString = target.library.uri.toString();
+ if (!_resynthesizer.hasLibrarySummary(uriString)) {
+ print('Not in summary: $result of $target ($uriString)');
scheglov 2016/05/03 18:56:16 We don't need this anymore.
Brian Wilkerson 2016/05/03 19:03:43 Good catch, done.
+ return false;
+ }
+ if (result == CREATED_RESOLVED_UNIT1 ||
+ result == CREATED_RESOLVED_UNIT2 ||
+ result == CREATED_RESOLVED_UNIT3 ||
+ result == CREATED_RESOLVED_UNIT4 ||
+ result == CREATED_RESOLVED_UNIT5 ||
+ result == CREATED_RESOLVED_UNIT6 ||
+ result == CREATED_RESOLVED_UNIT7 ||
+ result == CREATED_RESOLVED_UNIT8 ||
+ result == CREATED_RESOLVED_UNIT9 ||
+ result == CREATED_RESOLVED_UNIT10 ||
+ result == CREATED_RESOLVED_UNIT11 ||
+ result == CREATED_RESOLVED_UNIT12) {
+ entry.setValue(result, true, TargetedResult.EMPTY_LIST);
+ return true;
+ }
+ if (result == COMPILATION_UNIT_ELEMENT) {
+ String libraryUri = target.library.uri.toString();
+ String unitUri = target.unit.uri.toString();
+ CompilationUnitElement unit = _resynthesizer.getElement(
+ new ElementLocationImpl.con3(<String>[libraryUri, unitUri]));
+ if (unit != null) {
+ entry.setValue(result, unit, TargetedResult.EMPTY_LIST);
+ return true;
+ }
+ }
} else if (target is VariableElement) {
if (!_resynthesizer
.hasLibrarySummary(target.library.source.uri.toString())) {
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/summary/summary_sdk.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698