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

Unified Diff: lib/compiler/implementation/compile_time_constants.dart

Issue 10918188: Stop treating final as const in dart2js. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 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 | « no previous file | tests/co19/co19-dart2js.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/compile_time_constants.dart
diff --git a/lib/compiler/implementation/compile_time_constants.dart b/lib/compiler/implementation/compile_time_constants.dart
index 2ee3c68882924c9413edea44b306758fe9fa99dd..39e313d8a22661fecda85bb757476bec98ba7365 100644
--- a/lib/compiler/implementation/compile_time_constants.dart
+++ b/lib/compiler/implementation/compile_time_constants.dart
@@ -367,7 +367,9 @@ class CompileTimeConstantEvaluator extends AbstractVisitor {
for (StringInterpolationPart part in node.parts) {
Constant expression = evaluate(part.expression);
DartString expressionString;
- if (expression.isNum() || expression.isBool()) {
+ if (expression === null) {
+ return signalNotCompileTimeConstant(part.expression);
+ } else if (expression.isNum() || expression.isBool()) {
PrimitiveConstant primitive = expression;
expressionString = new DartString.literal(primitive.value.toString());
} else if (expression.isString()) {
@@ -392,9 +394,7 @@ class CompileTimeConstantEvaluator extends AbstractVisitor {
if (element.modifiers !== null) {
if (element.modifiers.isConst()) {
result = compiler.compileConstant(element);
- } else if (element.modifiers.isFinal()) {
- // TODO(4516): remove support for final compile-time constants: if
- // isCompilingConstant is true don't compile the variable.
+ } else if (element.modifiers.isFinal() && !isEvaluatingConstant) {
result = compiler.compileVariable(element);
}
}
« no previous file with comments | « no previous file | tests/co19/co19-dart2js.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698