| Index: pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
 | 
| diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
 | 
| index 120b411284a4e96e7afa4caf5d22da7ee63adc68..2f0cfd2bc194e99775c207bf95b13f4413e90e82 100644
 | 
| --- a/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
 | 
| +++ b/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
 | 
| @@ -4,17 +4,10 @@
 | 
|  
 | 
|  library fasta.kernel_field_builder;
 | 
|  
 | 
| -import 'package:kernel/ast.dart' show
 | 
| -    Expression,
 | 
| -    Field,
 | 
| -    Library,
 | 
| -    Name;
 | 
| -
 | 
| -import 'kernel_builder.dart' show
 | 
| -    Builder,
 | 
| -    FieldBuilder,
 | 
| -    KernelTypeBuilder,
 | 
| -    MetadataBuilder;
 | 
| +import 'package:kernel/ast.dart' show Expression, Field, Library, Name;
 | 
| +
 | 
| +import 'kernel_builder.dart'
 | 
| +    show Builder, FieldBuilder, KernelTypeBuilder, MetadataBuilder;
 | 
|  
 | 
|  class KernelFieldBuilder extends FieldBuilder<Expression> {
 | 
|    final Field field;
 | 
| @@ -23,14 +16,12 @@ class KernelFieldBuilder extends FieldBuilder<Expression> {
 | 
|  
 | 
|    KernelFieldBuilder(this.metadata, this.type, String name, int modifiers,
 | 
|        Builder compilationUnit, int charOffset)
 | 
| -      : field =
 | 
| -            new Field(null, fileUri: compilationUnit?.relativeFileUri)
 | 
| -                ..fileOffset = charOffset,
 | 
| +      : field = new Field(null, fileUri: compilationUnit?.relativeFileUri)
 | 
| +          ..fileOffset = charOffset,
 | 
|          super(name, modifiers, compilationUnit, charOffset);
 | 
|  
 | 
|    void set initializer(Expression value) {
 | 
| -    field.initializer = value
 | 
| -        ..parent = field;
 | 
| +    field.initializer = value..parent = field;
 | 
|    }
 | 
|  
 | 
|    Field build(Library library) {
 | 
| @@ -40,11 +31,11 @@ class KernelFieldBuilder extends FieldBuilder<Expression> {
 | 
|      }
 | 
|      bool isInstanceMember = !isStatic && !isTopLevel;
 | 
|      return field
 | 
| -        ..isFinal = isFinal
 | 
| -        ..isConst = isConst
 | 
| -        ..hasImplicitGetter = isInstanceMember
 | 
| -        ..hasImplicitSetter = isInstanceMember && !isConst && !isFinal
 | 
| -        ..isStatic = !isInstanceMember;
 | 
| +      ..isFinal = isFinal
 | 
| +      ..isConst = isConst
 | 
| +      ..hasImplicitGetter = isInstanceMember
 | 
| +      ..hasImplicitSetter = isInstanceMember && !isConst && !isFinal
 | 
| +      ..isStatic = !isInstanceMember;
 | 
|    }
 | 
|  
 | 
|    Field get target => field;
 | 
| 
 |