| Index: pkg/analyzer/lib/src/dart/element/element.dart
|
| diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
|
| index 0e58ac100e97fd9f05cb792f64c45976489f44c9..643343deb880ad5faaa8c7938b02bf20029f5c88 100644
|
| --- a/pkg/analyzer/lib/src/dart/element/element.dart
|
| +++ b/pkg/analyzer/lib/src/dart/element/element.dart
|
| @@ -1265,8 +1265,13 @@ class ClassElementImpl extends AbstractClassElementImpl
|
| while (supertype.classNode.isSyntheticMixinImplementation) {
|
| var superNode = supertype.classNode;
|
| var substitute = kernel.Substitution.fromSupertype(supertype);
|
| - var thisMixin = substitute.substituteSupertype(superNode.mixedInType);
|
| - _kernelMixins.add(thisMixin);
|
| +
|
| + var superMixin = superNode.mixedInType;
|
| + if (superMixin != null) {
|
| + var thisMixin = substitute.substituteSupertype(superMixin);
|
| + _kernelMixins.add(thisMixin);
|
| + }
|
| +
|
| supertype = substitute.substituteSupertype(superNode.supertype);
|
| }
|
| _kernelMixins = _kernelMixins.reversed.toList();
|
|
|