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

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

Issue 1679493002: Serialize initializers for final fields. (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
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/summary/summarize_elements.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/summary/summarize_ast.dart
diff --git a/pkg/analyzer/lib/src/summary/summarize_ast.dart b/pkg/analyzer/lib/src/summary/summarize_ast.dart
index fbe285782b2ba9e263fefd2d5cacf9f2f87a1a41..f9c64f6d1420db1be25253395bc0f1c416bd7ff2 100644
--- a/pkg/analyzer/lib/src/summary/summarize_ast.dart
+++ b/pkg/analyzer/lib/src/summary/summarize_ast.dart
@@ -247,6 +247,12 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
int numSlots = 0;
/**
+ * A flag indicating whether a variable declaration is in the context of a
+ * field declaration.
+ */
+ bool inFieldContext = false;
+
+ /**
* Create a slot id for storing a propagated or inferred type.
*/
int assignTypeSlot() => ++numSlots;
@@ -621,7 +627,7 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
b.nameOffset = variable.name.offset;
b.type = serializeTypeName(variables.type);
b.documentationComment = serializeDocumentation(documentationComment);
- if (variable.isConst) {
+ if (variable.isConst || variable.isFinal && inFieldContext) {
Expression initializer = variable.initializer;
if (initializer != null) {
b.constExpr = serializeConstExpr(initializer);
@@ -724,8 +730,13 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
@override
void visitFieldDeclaration(FieldDeclaration node) {
- serializeVariables(node.fields, node.staticKeyword != null,
- node.documentationComment, true);
+ try {
+ inFieldContext = true;
+ serializeVariables(node.fields, node.staticKeyword != null,
+ node.documentationComment, true);
+ } finally {
+ inFieldContext = false;
+ }
}
@override
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/summary/summarize_elements.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698