| Index: pkg/analyzer/lib/src/task/dart.dart | 
| diff --git a/pkg/analyzer/lib/src/task/dart.dart b/pkg/analyzer/lib/src/task/dart.dart | 
| index 4225da66e9be71b4bfbae0592ead3613e411e988..f62c3f3ca4f7c53fc7fa7b2507eaef5108696d8e 100644 | 
| --- a/pkg/analyzer/lib/src/task/dart.dart | 
| +++ b/pkg/analyzer/lib/src/task/dart.dart | 
| @@ -1463,7 +1463,7 @@ class BuildLibraryElementTask extends SourceBasedAnalysisTask { | 
| for (CompilationUnitElement unit in library.parts) { | 
| _collectAccessors(getters, setters, unit); | 
| } | 
| -    for (PropertyAccessorElementImpl setter in setters) { | 
| +    for (PropertyAccessorElement setter in setters) { | 
| PropertyAccessorElement getter = getters[setter.displayName]; | 
| if (getter != null) { | 
| TopLevelVariableElementImpl variable = getter.variable; | 
| @@ -1471,7 +1471,7 @@ class BuildLibraryElementTask extends SourceBasedAnalysisTask { | 
| CompilationUnitElementImpl setterUnit = setterVariable.enclosingElement; | 
| setterUnit.replaceTopLevelVariable(setterVariable, variable); | 
| variable.setter = setter; | 
| -        setter.variable = variable; | 
| +        (setter as PropertyAccessorElementImpl).variable = variable; | 
| } | 
| } | 
| } | 
| @@ -3328,7 +3328,8 @@ class _SourceClosureTaskInputBuilder implements TaskInputBuilder<List<Source>> { | 
| ResultDescriptor get currentResult => LIBRARY_ELEMENT2; | 
|  | 
| @override | 
| -  void set currentValue(LibraryElement library) { | 
| +  void set currentValue(Object value) { | 
| +    LibraryElement library = value; | 
| if (_libraries.add(library)) { | 
| if (kind == _SourceClosureKind.IMPORT || | 
| kind == _SourceClosureKind.IMPORT_EXPORT) { | 
|  |