| Index: runtime/vm/kernel_to_il.cc
|
| diff --git a/runtime/vm/kernel_to_il.cc b/runtime/vm/kernel_to_il.cc
|
| index 1e0a4064281dc05de46799efd2c132fd3fa5ad7c..53b29084854078f68a6ff7a1f81fe5e75e0e3f4a 100644
|
| --- a/runtime/vm/kernel_to_il.cc
|
| +++ b/runtime/vm/kernel_to_il.cc
|
| @@ -4073,6 +4073,22 @@ JoinEntryInstr* FlowGraphBuilder::BuildJoinEntry() {
|
| }
|
|
|
|
|
| +Fragment FlowGraphBuilder::TranslateFieldInitializer(Field* kernel_field,
|
| + Expression* init) {
|
| + dart::Field& field =
|
| + dart::Field::ZoneHandle(Z, H.LookupFieldByKernelField(kernel_field));
|
| + if (init->IsNullLiteral()) {
|
| + field.RecordStore(Object::null_object());
|
| + return Fragment();
|
| + }
|
| + Fragment instructions;
|
| + instructions += LoadLocal(scopes_->this_variable);
|
| + instructions += TranslateExpression(init);
|
| + instructions += StoreInstanceFieldGuarded(field, true);
|
| + return instructions;
|
| +}
|
| +
|
| +
|
| Fragment FlowGraphBuilder::TranslateInitializers(
|
| Class* kernel_klass,
|
| List<Initializer>* initializers) {
|
| @@ -4086,13 +4102,8 @@ Fragment FlowGraphBuilder::TranslateInitializers(
|
| Field* kernel_field = kernel_klass->fields()[i];
|
| Expression* init = kernel_field->initializer();
|
| if (!kernel_field->IsStatic() && init != NULL) {
|
| - dart::Field& field =
|
| - dart::Field::ZoneHandle(Z, H.LookupFieldByKernelField(kernel_field));
|
| -
|
| EnterScope(kernel_field);
|
| - instructions += LoadLocal(scopes_->this_variable);
|
| - instructions += TranslateExpression(init);
|
| - instructions += StoreInstanceFieldGuarded(field, true);
|
| + instructions += TranslateFieldInitializer(kernel_field, init);
|
| ExitScope(kernel_field);
|
| }
|
| }
|
| @@ -4107,12 +4118,7 @@ Fragment FlowGraphBuilder::TranslateInitializers(
|
| Initializer* initializer = (*initializers)[i];
|
| if (initializer->IsFieldInitializer()) {
|
| FieldInitializer* init = FieldInitializer::Cast(initializer);
|
| - dart::Field& field =
|
| - dart::Field::ZoneHandle(Z, H.LookupFieldByKernelField(init->field()));
|
| -
|
| - instructions += LoadLocal(scopes_->this_variable);
|
| - instructions += TranslateExpression(init->value());
|
| - instructions += StoreInstanceFieldGuarded(field, true);
|
| + instructions += TranslateFieldInitializer(init->field(), init->value());
|
| } else if (initializer->IsSuperInitializer()) {
|
| SuperInitializer* init = SuperInitializer::Cast(initializer);
|
|
|
|
|