compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java - Issue 10907215: Issue 3553. Stop treating static final variables as constants

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10907215: Issue 3553. Stop treating static final variables as constants (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Tweaks for tests Created 8 years, 3 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 | « compiler/java/com/google/dart/compiler/resolver/Elements.java ('k') | compiler/java/com/google/dart/compiler/resolver/Resolver.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java

diff --git a/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java b/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java

index 2bc4040d3a0b10666d8d34a10dcd1ee473731304..21cfb297ac091e95d9dd9a8e63dbe083d7bd4dfa 100644

--- a/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java

+++ b/compiler/java/com/google/dart/compiler/resolver/MemberBuilder.java

@@ -353,12 +353,9 @@ public class MemberBuilder {

private FieldElement buildField(DartField fieldNode, Type type) {

assert !fieldNode.getModifiers().isAbstractField();

Modifiers modifiers = fieldNode.getModifiers();

- if (modifiers.isFinal() && (modifiers.isStatic() || context == topLevelContext)) {

- // final top-level fields are implicitly compile-time constants.

+ // top-level fields are implicitly static.

+ if (context == topLevelContext) {

modifiers = modifiers.makeStatic();

- // Set the "const" modifier so that it is easy to compare a constant field to other

- // types of constant expressions.

- modifiers = modifiers.makeConstant();

}

if (fieldNode.getValue() != null) {

modifiers = modifiers.makeInitialized();