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

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

Issue 1700203002: Serialize and resynthesize unresolved identifiers. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 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
Index: pkg/analyzer/lib/src/summary/summarize_elements.dart
diff --git a/pkg/analyzer/lib/src/summary/summarize_elements.dart b/pkg/analyzer/lib/src/summary/summarize_elements.dart
index c18ec66974bba635150fd8e0ed10ac43b14c0b9c..84f1bec3b1b5f8247bda2e7b961261f4f65ca5a4 100644
--- a/pkg/analyzer/lib/src/summary/summarize_elements.dart
+++ b/pkg/analyzer/lib/src/summary/summarize_elements.dart
@@ -1081,9 +1081,24 @@ class _ConstExprSerializer extends AbstractConstExprSerializer {
}
}
- EntityRefBuilder serializeIdentifier(Identifier identifier) {
+ EntityRefBuilder serializeIdentifier(Identifier identifier,
+ {int prefixReference: 0}) {
Element element = identifier.staticElement;
- assert(element != null);
+ // Unresolved identifier.
+ if (element == null) {
+ int reference;
+ if (identifier is PrefixedIdentifier) {
+ int prefix = serializeIdentifier(identifier.prefix).reference;
+ reference = serializer.serializeUnlinkedReference(
+ identifier.identifier.name, ReferenceKind.unresolved,
+ prefixReference: prefix);
+ } else {
+ reference = serializer.serializeUnlinkedReference(
+ identifier.name, ReferenceKind.unresolved,
+ prefixReference: prefixReference);
+ }
+ return new EntityRefBuilder(reference: reference);
+ }
// The only supported instance property accessor - `length`.
if (identifier is PrefixedIdentifier &&
element is PropertyAccessorElement &&
@@ -1106,7 +1121,19 @@ class _ConstExprSerializer extends AbstractConstExprSerializer {
@override
EntityRefBuilder serializePropertyAccess(PropertyAccess access) {
Element element = access.propertyName.staticElement;
- assert(element != null);
+ // Unresolved property access.
+ if (element == null) {
+ Expression target = access.target;
+ if (target is Identifier) {
+ EntityRefBuilder targetRef = serializeIdentifier(target);
+ EntityRefBuilder propertyRef = serializeIdentifier(access.propertyName,
+ prefixReference: targetRef.reference);
+ return new EntityRefBuilder(reference: propertyRef.reference);
+ } else {
+ // TODO(scheglov) should we handle other targets in malformed constants?
+ throw new StateError('Unexpected target type: ${target.runtimeType}');
+ }
+ }
// The only supported instance property accessor - `length`.
Expression target = access.target;
if (target is Identifier &&
« no previous file with comments | « pkg/analyzer/lib/src/summary/resynthesize.dart ('k') | pkg/analyzer/test/src/summary/resynthesize_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698