| Index: pkg/compiler/lib/src/resolution/class_members.dart
|
| diff --git a/pkg/compiler/lib/src/resolution/class_members.dart b/pkg/compiler/lib/src/resolution/class_members.dart
|
| index acf7885d7ea53dd6cd8c902af99b1442ec712bac..b99732adc328317fb315ceb064a6c4a6e5a50290 100644
|
| --- a/pkg/compiler/lib/src/resolution/class_members.dart
|
| +++ b/pkg/compiler/lib/src/resolution/class_members.dart
|
| @@ -34,8 +34,8 @@ abstract class MembersCreator {
|
|
|
| MembersCreator(
|
| this.resolution, this.cls, this.computedMemberNames, this.classMembers) {
|
| - assert(invariant(cls, cls.isDeclaration,
|
| - message: "Members may only be computed on declarations."));
|
| + assert(cls.isDeclaration,
|
| + failedAt(cls, "Members may only be computed on declarations."));
|
| }
|
|
|
| DiagnosticReporter get reporter => resolution.reporter;
|
| @@ -213,7 +213,7 @@ abstract class MembersCreator {
|
| name = name.setter;
|
| addDeclaredMember(name, type, functionType);
|
| } else {
|
| - assert(invariant(element, element.isFunction));
|
| + assert(element.isFunction, failedAt(element));
|
| ResolutionFunctionType type = element.computeType(resolution);
|
| addDeclaredMember(name, type, type);
|
| }
|
| @@ -366,8 +366,8 @@ abstract class MembersCreator {
|
| for (Member inherited in superMember.declarations) {
|
| if (cls == inherited.declarer.element) {
|
| // An error should already have been reported.
|
| - assert(invariant(
|
| - declared.element, resolution.reporter.hasReportedError));
|
| + assert(resolution.reporter.hasReportedError,
|
| + failedAt(declared.element));
|
| continue;
|
| }
|
|
|
| @@ -389,9 +389,11 @@ abstract class MembersCreator {
|
| } else if (cls == inherited.declarer.element) {
|
| // An error should already have been reported.
|
| assert(
|
| - invariant(declared.element, resolution.reporter.hasReportedError,
|
| - message: "Member $inherited inherited from its "
|
| - "declaring class: ${cls}."));
|
| + resolution.reporter.hasReportedError,
|
| + failedAt(
|
| + declared.element,
|
| + "Member $inherited inherited from its "
|
| + "declaring class: ${cls}."));
|
| continue;
|
| }
|
|
|
|
|