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

Side by Side Diff: pkg/dev_compiler/lib/src/compiler/side_effect_analysis.dart

Issue 2684303002: Use computeConstantValue instead of constantValue (Closed)
Patch Set: Created 3 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 unified diff | Download patch
« no previous file with comments | « pkg/dev_compiler/lib/src/compiler/nullable_type_inference.dart ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 import 'package:analyzer/dart/ast/ast.dart'; 5 import 'package:analyzer/dart/ast/ast.dart';
6 import 'package:analyzer/dart/ast/visitor.dart'; 6 import 'package:analyzer/dart/ast/visitor.dart';
7 import 'package:analyzer/dart/element/element.dart'; 7 import 'package:analyzer/dart/element/element.dart';
8 import 'package:analyzer/src/generated/constant.dart'; 8 import 'package:analyzer/src/generated/constant.dart';
9 import 'package:analyzer/error/listener.dart' 9 import 'package:analyzer/error/listener.dart'
10 show AnalysisErrorListener, ErrorReporter; 10 show AnalysisErrorListener, ErrorReporter;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 // TODO(jmesserly): this is used to determine if the field initialization is 117 // TODO(jmesserly): this is used to determine if the field initialization is
118 // side effect free. We should make the check more general, as things like 118 // side effect free. We should make the check more general, as things like
119 // list/map literals/regexp are also side effect free and fairly common 119 // list/map literals/regexp are also side effect free and fairly common
120 // to use as field initializers. 120 // to use as field initializers.
121 bool isFieldInitConstant(VariableDeclaration field) => 121 bool isFieldInitConstant(VariableDeclaration field) =>
122 field.initializer == null || computeConstant(field) != null; 122 field.initializer == null || computeConstant(field) != null;
123 123
124 DartObject computeConstant(VariableDeclaration field) { 124 DartObject computeConstant(VariableDeclaration field) {
125 // If the constant is already computed by ConstantEvaluator, just return it. 125 // If the constant is already computed by ConstantEvaluator, just return it.
126 VariableElement element = field.element; 126 VariableElement element = field.element;
127 var result = element.constantValue; 127 var result = element.computeConstantValue();
128 if (result != null) return result; 128 if (result != null) return result;
129 129
130 // ConstantEvaluator will not compute constants for non-const fields, 130 // ConstantEvaluator will not compute constants for non-const fields,
131 // so run ConstantVisitor for those to figure out if the initializer is 131 // so run ConstantVisitor for those to figure out if the initializer is
132 // actually a constant (and therefore side effect free to evaluate). 132 // actually a constant (and therefore side effect free to evaluate).
133 assert(!field.isConst); 133 assert(!field.isConst);
134 134
135 var initializer = field.initializer; 135 var initializer = field.initializer;
136 if (initializer == null) return null; 136 if (initializer == null) return null;
137 return initializer.accept(constantVisitor); 137 return initializer.accept(constantVisitor);
138 } 138 }
139 } 139 }
OLDNEW
« no previous file with comments | « pkg/dev_compiler/lib/src/compiler/nullable_type_inference.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698