| Index: pkg/compiler/lib/src/js_model/closure.dart
|
| diff --git a/pkg/compiler/lib/src/js_model/closure.dart b/pkg/compiler/lib/src/js_model/closure.dart
|
| index 8ecb8b571bcc1c56b316a461e344d038ef51e98f..fe1e2d4adc039875852549027cbe67c4417360f5 100644
|
| --- a/pkg/compiler/lib/src/js_model/closure.dart
|
| +++ b/pkg/compiler/lib/src/js_model/closure.dart
|
| @@ -193,11 +193,13 @@ class KernelClosureConversionTask extends ClosureConversionTask<ir.Node> {
|
| @override
|
| ClosureRepresentationInfo getClosureInfoForMember(MemberEntity entity) {
|
| var closure = _memberClosureRepresentationMap[entity];
|
| - assert(
|
| + // TODO(johnniwinther): Re-insert assertion or remove
|
| + // [getClosureInfoForMember].
|
| + /*assert(
|
| closure != null,
|
| "Corresponding closure class not found for $entity. "
|
| - "Closures found for ${_memberClosureRepresentationMap.keys}");
|
| - return closure;
|
| + "Closures found for ${_memberClosureRepresentationMap.keys}");*/
|
| + return closure ?? const ClosureRepresentationInfo();
|
| }
|
|
|
| @override
|
| @@ -526,12 +528,30 @@ class ClosureFieldData extends ClosureMemberData implements FieldData {
|
| }
|
|
|
| @override
|
| - ConstantExpression getFieldConstant(
|
| - KernelToElementMap elementMap, FieldEntity field) {
|
| + ConstantExpression getFieldConstantExpression(KernelToElementMap elementMap) {
|
| + failedAt(
|
| + definition.member,
|
| + "Unexpected field ${definition.member} in "
|
| + "ClosureFieldData.getFieldConstantExpression");
|
| + return null;
|
| + }
|
| +
|
| + @override
|
| + ConstantValue getConstantFieldInitializer(KernelToElementMap elementMap) {
|
| failedAt(
|
| - field,
|
| - "Unexpected field $field in "
|
| - "ClosureFieldData.getFieldConstant");
|
| + definition.member,
|
| + "Unexpected field ${definition.member} in "
|
| + "ClosureFieldData.getConstantFieldInitializer");
|
| + return null;
|
| + }
|
| +
|
| + @override
|
| + bool hasConstantFieldInitializer(KernelToElementMap elementMap) {
|
| + return false;
|
| + }
|
| +
|
| + @override
|
| + ConstantValue getFieldConstantValue(KernelToElementMap elementMap) {
|
| return null;
|
| }
|
| }
|
|
|