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

Unified Diff: compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantAnalyzer.java

Issue 10854030: Issue 4400. Fix for using top-level field in instance field initializer (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 4 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 | compiler/javatests/com/google/dart/compiler/resolver/CompileTimeConstantTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantAnalyzer.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantAnalyzer.java b/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantAnalyzer.java
index 82a1017b89851c73d7ccaa5718a55e68c5bbdf78..ae8d2e4f4bae8b08f8bfbb975b6bec7c9caace27 100644
--- a/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantAnalyzer.java
+++ b/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstantAnalyzer.java
@@ -800,7 +800,9 @@ public class CompileTimeConstantAnalyzer {
NodeElement element = node.getElement();
if (ElementKind.of(element) == ElementKind.FIELD) {
FieldElement fieldElement = (FieldElement) element;
- if (!fieldElement.isStatic()) {
+ boolean isStatic = fieldElement.getModifiers().isStatic()
+ || Elements.isTopLevel(fieldElement);
+ if (!isStatic) {
context.onError(new DartCompilationError(node,
ResolverErrorCode.CANNOT_USE_INSTANCE_FIELD_IN_INSTANCE_FIELD_INITIALIZER));
}
« no previous file with comments | « no previous file | compiler/javatests/com/google/dart/compiler/resolver/CompileTimeConstantTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698