compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java - Issue 8231031: Check for compile-time constants in DartCompiler

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/TopLevelElementBuilder.java

Issue 8231031: Check for compile-time constants in DartCompiler (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Renamed CompileTimeConstTest to CTConst2Test Created 9 years, 2 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

« compiler/java/com/google/dart/compiler/resolver/Resolver.java ('K') | « compiler/java/com/google/dart/compiler/resolver/Resolver.java ('k') | compiler/javatests/com/google/dart/compiler/backend/js/testFieldAccessExprOpt.dart » ('j') | compiler/javatests/com/google/dart/compiler/backend/js/testFieldAccessExprOpt.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 116f0a84ed6e8dd83421cf197303ff9c8335c966..d9e3dee109b3aeb22868ef8d395b132cdde3fa98 100644

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

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

@@ -20,6 +20,7 @@ import com.google.dart.compiler.ast.DartNodeTraverser;

import com.google.dart.compiler.ast.DartTypeParameter;

import com.google.dart.compiler.ast.DartUnit;

import com.google.dart.compiler.ast.LibraryUnit;

+import com.google.dart.compiler.ast.Modifiers;

import com.google.dart.compiler.common.SourceInfo;

import com.google.dart.compiler.type.Types;

@@ -150,7 +151,12 @@ public class TopLevelElementBuilder {

@Override

public Void visitField(DartField node) {

- node.setSymbol(Elements.fieldFromNode(node, library, node.getModifiers()));

+ Modifiers modifiers = node.getModifiers();

+ if (modifiers.isFinal()) {

+ // final toplevel fields are implicitly compile-time constants.

+ modifiers = modifiers.makeConstant();

+ }

+ node.setSymbol(Elements.fieldFromNode(node, library, modifiers));

return null;

}