| Index: runtime/vm/intermediate_language.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language.cc (revision 33058)
|
| +++ runtime/vm/intermediate_language.cc (working copy)
|
| @@ -171,12 +171,16 @@
|
|
|
|
|
| bool StoreInstanceFieldInstr::IsUnboxedStore() const {
|
| - return FLAG_unbox_numeric_fields && field().IsUnboxedField();
|
| + return FLAG_unbox_numeric_fields
|
| + && !field().IsNull()
|
| + && field().IsUnboxedField();
|
| }
|
|
|
|
|
| bool StoreInstanceFieldInstr::IsPotentialUnboxedStore() const {
|
| - return FLAG_unbox_numeric_fields && field().IsPotentialUnboxedField();
|
| + return FLAG_unbox_numeric_fields
|
| + && !field().IsNull()
|
| + && field().IsPotentialUnboxedField();
|
| }
|
|
|
|
|
|
|