| Index: pkg/analyzer/lib/src/generated/resolver.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
|
| index 2d337b4b8d0f055936bc5d0ca2e5b8c133506c0a..75f9dfac66de6da9eb9e6ecfdd053bc60b83b142 100644
|
| --- a/pkg/analyzer/lib/src/generated/resolver.dart
|
| +++ b/pkg/analyzer/lib/src/generated/resolver.dart
|
| @@ -5769,9 +5769,14 @@ class InheritanceManager {
|
| String key = map.getKey(j);
|
| ExecutableElement value = map.getValue(j);
|
| if (key != null) {
|
| - if (resultMap.get(key) == null ||
|
| - (resultMap.get(key) != null && !_isAbstract(value))) {
|
| - resultMap.put(key, value);
|
| + ClassElement definingClass = value
|
| + .getAncestor((Element element) => element is ClassElement);
|
| + if (!definingClass.type.isObject) {
|
| + ExecutableElement existingValue = resultMap.get(key);
|
| + if (existingValue == null ||
|
| + (existingValue != null && !_isAbstract(value))) {
|
| + resultMap.put(key, value);
|
| + }
|
| }
|
| }
|
| }
|
|
|