Chromium Code Reviews| 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..05bec10e4a67f314e8f37a8ab1452e0419b54539 100644 |
| --- a/pkg/compiler/lib/src/js_model/closure.dart |
| +++ b/pkg/compiler/lib/src/js_model/closure.dart |
| @@ -193,11 +193,11 @@ class KernelClosureConversionTask extends ClosureConversionTask<ir.Node> { |
| @override |
| ClosureRepresentationInfo getClosureInfoForMember(MemberEntity entity) { |
| var closure = _memberClosureRepresentationMap[entity]; |
| - assert( |
| + /*assert( |
|
Siggi Cherem (dart-lang)
2017/08/25 18:19:11
TODO? does it happen because of some of the change
Johnni Winther
2017/08/25 18:32:20
Adding a TODO. We are moving towards using getScop
|
| 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 +526,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; |
| } |
| } |