| Index: lib/compiler/implementation/compiler.dart
|
| diff --git a/lib/compiler/implementation/compiler.dart b/lib/compiler/implementation/compiler.dart
|
| index abc40e3844ecb79c6f81597dd1aa5ef21c544333..ca6ca2ba8cb60374a28e6029a5089e9d50e33292 100644
|
| --- a/lib/compiler/implementation/compiler.dart
|
| +++ b/lib/compiler/implementation/compiler.dart
|
| @@ -556,8 +556,12 @@ class Compiler implements DiagnosticListener {
|
| while (!patches.isEmpty()) {
|
| Element patchElement = patches.head;
|
| Element originalElement = lookup(patchElement.name);
|
| - // Getters and setters are kept inside a synthetic field.
|
| - if (patchElement.kind === ElementKind.ABSTRACT_FIELD) {
|
| + if (patchElement.isAccessor()) {
|
| + // Skip accessors. An accessor always has an abstract field,
|
| + // representing the accessor in the lookup scope. We can thus skip the
|
| + // accessors and just handle the abstract field.
|
| + } else if (patchElement.kind === ElementKind.ABSTRACT_FIELD) {
|
| + // Getters and setters are kept inside a synthetic field.
|
| if (originalElement !== null &&
|
| originalElement.kind !== ElementKind.ABSTRACT_FIELD) {
|
| internalError("Cannot patch non-getter/setter with getter/setter",
|
|
|