Skip to content

Commit

Permalink
[cfe] Migrate constant evaluator
Browse files Browse the repository at this point in the history 
Change-Id: I6e8496886257bd1361a004c8672064542427928e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/200867
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>
  • Loading branch information
@johnniwinther
johnniwinther authored and commit-bot@chromium.org committed May 21, 2021
1 parent 2d0edde commit d8bbd35
Show file tree
Hide file tree
Showing 5 changed files with 576 additions and 493 deletions.
40 changes: 20 additions & 20 deletions pkg/front_end/lib/src/fasta/kernel/constant_collection_builders.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

// @dart = 2.9

part of 'constant_evaluator.dart';

abstract class _ListOrSetConstantBuilder<L extends Expression> {
Expand All @@ -23,7 +21,7 @@ abstract class _ListOrSetConstantBuilder<L extends Expression> {
///
/// Returns [null] on success and an error-"constant" on failure, as such the
/// return value should be checked.
AbortConstant add(Expression element) {
AbortConstant? add(Expression element) {
Constant constant = evaluator._evaluateSubexpression(element);
if (constant is AbortConstant) return constant;
if (evaluator.shouldBeUnevaluated) {
Expand All @@ -37,7 +35,7 @@ abstract class _ListOrSetConstantBuilder<L extends Expression> {

/// Returns [null] on success and an error-"constant" on failure, as such the
/// return value should be checked.
AbortConstant addSpread(Expression spreadExpression) {
AbortConstant? addSpread(Expression spreadExpression) {
Constant constant = evaluator._evaluateSubexpression(spreadExpression);
if (constant is AbortConstant) return constant;
Constant spread = evaluator.unlower(constant);
Expand Down Expand Up @@ -73,7 +71,7 @@ abstract class _ListOrSetConstantBuilder<L extends Expression> {
spreadExpression, messageConstEvalNotListOrSetInSpread);
}
for (Constant entry in entries) {
AbortConstant error = addConstant(entry, spreadExpression);
AbortConstant? error = addConstant(entry, spreadExpression);
if (error != null) return error;
}
}
Expand All @@ -82,7 +80,7 @@ abstract class _ListOrSetConstantBuilder<L extends Expression> {

/// Returns [null] on success and an error-"constant" on failure, as such the
/// return value should be checked.
AbortConstant addConstant(Constant constant, TreeNode context);
AbortConstant? addConstant(Constant constant, TreeNode context);

Constant build();
}
Expand All @@ -104,10 +102,10 @@ class ListConstantBuilder extends _ListOrSetConstantBuilder<ListLiteral> {
new ListLiteral(elements, isConst: true);

@override
AbortConstant addConstant(Constant constant, TreeNode context) {
AbortConstant? addConstant(Constant constant, TreeNode context) {
List<Constant> lastPart;
if (parts.last is List<Constant>) {
lastPart = parts.last;
lastPart = parts.last as List<Constant>;
} else {
// Probably unreachable.
parts.add(lastPart = <Constant>[]);
Expand All @@ -122,11 +120,12 @@ class ListConstantBuilder extends _ListOrSetConstantBuilder<ListLiteral> {
Constant build() {
if (parts.length == 1) {
// Fully evaluated
List<Constant> entries = parts.single as List<Constant>;
if (isMutable) {
return new MutableListConstant(elementType, parts.single);
return new MutableListConstant(elementType, entries);
}
return evaluator
.lowerListConstant(new ListConstant(elementType, parts.single));
.lowerListConstant(new ListConstant(elementType, entries));
}
// TODO(kallentu): Handle partially evaluated [isMutable] lists.
List<Expression> lists = <Expression>[];
Expand Down Expand Up @@ -158,7 +157,7 @@ class SetConstantBuilder extends _ListOrSetConstantBuilder<SetLiteral> {
new SetLiteral(elements, isConst: true);

@override
AbortConstant addConstant(Constant constant, TreeNode context) {
AbortConstant? addConstant(Constant constant, TreeNode context) {
if (!evaluator.hasPrimitiveEqual(constant)) {
return evaluator.createErrorConstant(
context,
Expand All @@ -184,7 +183,7 @@ class SetConstantBuilder extends _ListOrSetConstantBuilder<SetLiteral> {

List<Constant> lastPart;
if (parts.last is List<Constant>) {
lastPart = parts.last;
lastPart = parts.last as List<Constant>;
} else {
// Probably unreachable.
parts.add(lastPart = <Constant>[]);
Expand All @@ -199,7 +198,7 @@ class SetConstantBuilder extends _ListOrSetConstantBuilder<SetLiteral> {
Constant build() {
if (parts.length == 1) {
// Fully evaluated
List<Constant> entries = parts.single;
List<Constant> entries = parts.single as List<Constant>;
SetConstant result = new SetConstant(elementType, entries);
return evaluator.lowerSetConstant(result);
}
Expand Down Expand Up @@ -239,7 +238,7 @@ class MapConstantBuilder {
///
/// Returns [null] on success and an error-"constant" on failure, as such the
/// return value should be checked.
AbortConstant add(MapLiteralEntry element) {
AbortConstant? add(MapLiteralEntry element) {
Constant key = evaluator._evaluateSubexpression(element.key);
if (key is AbortConstant) return key;
Constant value = evaluator._evaluateSubexpression(element.value);
Expand All @@ -259,7 +258,7 @@ class MapConstantBuilder {

/// Returns [null] on success and an error-"constant" on failure, as such the
/// return value should be checked.
AbortConstant addSpread(Expression spreadExpression) {
AbortConstant? addSpread(Expression spreadExpression) {
Constant constant = evaluator._evaluateSubexpression(spreadExpression);
if (constant is AbortConstant) return constant;
Constant spread = evaluator.unlower(constant);
Expand All @@ -274,12 +273,12 @@ class MapConstantBuilder {
// Fully evaluated spread
if (spread is MapConstant) {
for (ConstantMapEntry entry in spread.entries) {
AbortConstant error = addConstant(
AbortConstant? error = addConstant(
entry.key, entry.value, spreadExpression, spreadExpression);
if (error != null) return error;
}
} else if (evaluator.backend.isLoweredMapConstant(spread)) {
AbortConstant error;
AbortConstant? error;
evaluator.backend.forEachLoweredMapConstantEntry(spread,
(Constant key, Constant value) {
error ??= addConstant(key, value, spreadExpression, spreadExpression);
Expand All @@ -296,11 +295,11 @@ class MapConstantBuilder {

/// Returns [null] on success and an error-"constant" on failure, as such the
/// return value should be checked.
AbortConstant addConstant(Constant key, Constant value, TreeNode keyContext,
AbortConstant? addConstant(Constant key, Constant value, TreeNode keyContext,
TreeNode valueContext) {
List<ConstantMapEntry> lastPart;
if (parts.last is List<ConstantMapEntry>) {
lastPart = parts.last;
lastPart = parts.last as List<ConstantMapEntry>;
} else {
// Probably unreachable.
parts.add(lastPart = <ConstantMapEntry>[]);
Expand Down Expand Up @@ -337,8 +336,9 @@ class MapConstantBuilder {
Constant build() {
if (parts.length == 1) {
// Fully evaluated
List<ConstantMapEntry> entries = parts.single as List<ConstantMapEntry>;
return evaluator
.lowerMapConstant(new MapConstant(keyType, valueType, parts.single));
.lowerMapConstant(new MapConstant(keyType, valueType, entries));
}
List<Expression> maps = <Expression>[];
for (Object part in parts) {
Expand Down
Loading

0 comments on commit d8bbd35

Please sign in to comment.