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

Unified Diff: pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart

Issue 2916393002: Compute constants from IR nodes (Closed)
Patch Set: Updated cf. comments Created 3 years, 7 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 | « pkg/compiler/lib/src/ssa/builder_kernel.dart ('k') | tests/language/language_dart2js.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
diff --git a/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart b/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
index e195c5c48bba940aa6796f824b7fe4f764f38f69..2ff6df7865cb2a224c4fe7c3e140dedefcd80371 100644
--- a/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
+++ b/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
@@ -86,8 +86,16 @@ class KernelAstAdapter extends KernelToElementMapMixin
}
@override
- ConstantValue computeConstantValue(ConstantExpression constant) {
- return _compiler.constants.getConstantValue(constant);
+ ConstantValue computeConstantValue(ConstantExpression constant,
+ {bool requireConstant: true}) {
+ _compiler.backend.constants.evaluate(constant);
+ ConstantValue value =
+ _compiler.backend.constants.getConstantValue(constant);
+ if (value == null && requireConstant) {
+ throw new UnsupportedError(
+ 'No constant value for ${constant.toStructuredText()}');
+ }
+ return value;
}
/// Called to find the corresponding Kernel element for a particular Element
@@ -148,19 +156,6 @@ class KernelAstAdapter extends KernelToElementMapMixin
TreeElements get elements => _resolvedAst.elements;
DiagnosticReporter get reporter => _compiler.reporter;
- ConstantValue getConstantForSymbol(ir.SymbolLiteral node) {
- if (kernel.syntheticNodes.contains(node)) {
- return _backend.constantSystem
- .createSymbol(_compiler.commonElements, node.value);
- }
- ast.Node astNode = getNode(node);
- ConstantValue constantValue = _backend.constants
- .getConstantValueForNode(astNode, _resolvedAst.elements);
- assert(invariant(astNode, constantValue != null,
- message: 'No constant computed for $node'));
- return constantValue;
- }
-
// TODO(johnniwinther): Use the more precise functions below.
Element getElement(ir.Node node) {
Element result = _nodeToElement[node];
@@ -229,37 +224,6 @@ class KernelAstAdapter extends KernelToElementMapMixin
return getElement(function).asFunctionElement().functionSignature;
}
- ConstantValue getConstantFor(ir.Node node) {
- // Some `null`s are not mapped when they correspond to errors, e.g. missing
- // `const` initializers.
- if (node is ir.NullLiteral) return new NullConstantValue();
-
- ConstantValue constantValue =
- _backend.constants.getConstantValueForNode(getNode(node), elements);
- assert(invariant(getNode(node), constantValue != null,
- message: 'No constant computed for $node'));
- return constantValue;
- }
-
- ConstantValue getConstantForParameterDefaultValue(ir.Node defaultExpression) {
- // TODO(27394): Evaluate constant expressions in ir.Node domain.
- // In the interim, expand the Constantifier and do this:
- //
- // ConstantExpression constantExpression =
- // defaultExpression.accept(new Constantifier(this));
- // assert(constantExpression != null);
- ConstantExpression constantExpression =
- kernel.parameterInitializerNodeToConstant[defaultExpression];
- if (constantExpression == null) return null;
- return _backend.constants.getConstantValue(constantExpression);
- }
-
- ConstantValue getConstantForType(ir.DartType irType) {
- ResolutionDartType type = getDartType(irType);
- return _backend.constantSystem
- .createType(_compiler.commonElements, type.asRaw());
- }
-
// Is the member a lazy initialized static or top-level member?
bool isLazyStatic(ir.Member member) {
if (member is ir.Field) {
« no previous file with comments | « pkg/compiler/lib/src/ssa/builder_kernel.dart ('k') | tests/language/language_dart2js.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698