Chromium Code Reviews| Index: runtime/vm/intermediate_language_arm64.cc |
| diff --git a/runtime/vm/intermediate_language_arm64.cc b/runtime/vm/intermediate_language_arm64.cc |
| index 84884ae471c9cc87a3feac3f4ea3eba8c9f5f7b0..e9c360b40cad0fce7296bece784c1c374094ab1c 100644 |
| --- a/runtime/vm/intermediate_language_arm64.cc |
| +++ b/runtime/vm/intermediate_language_arm64.cc |
| @@ -1467,7 +1467,7 @@ void GuardFieldClassInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
| Label* fail = (deopt != NULL) ? deopt : &fail_label; |
| if (emit_full_guard) { |
| - __ LoadObject(field_reg, Field::ZoneHandle(field().raw())); |
| + __ LoadObject(field_reg, Field::ZoneHandle(field().Original())); |
| FieldAddress field_cid_operand( |
| field_reg, Field::guarded_cid_offset(), kUnsignedWord); |
| @@ -1611,7 +1611,7 @@ void GuardFieldLengthInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
| Label ok; |
| - __ LoadObject(field_reg, Field::ZoneHandle(field().raw())); |
| + __ LoadObject(field_reg, Field::ZoneHandle(field().Original())); |
| __ ldr(offset_reg, |
| FieldAddress(field_reg, |
| @@ -1837,7 +1837,7 @@ void StoreInstanceFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
| Label store_float32x4; |
| Label store_float64x2; |
| - __ LoadObject(temp, Field::ZoneHandle(field().raw())); |
| + __ LoadObject(temp, *field().OriginalAsHandle(compiler->zone())); |
|
siva
2016/02/25 23:38:32
Ditto.
|
| __ LoadFieldFromOffset(temp2, temp, Field::is_nullable_offset(), |
| kUnsignedWord); |
| @@ -1975,7 +1975,7 @@ void StoreStaticFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
| const Register value = locs()->in(0).reg(); |
| const Register temp = locs()->temp(0).reg(); |
| - __ LoadObject(temp, field()); |
| + __ LoadObject(temp, *field().OriginalAsHandle(compiler->zone())); |
|
siva
2016/02/25 23:38:32
Ditto.
srdjan
2016/02/26 00:40:42
Done.
|
| if (this->value()->NeedsStoreBuffer()) { |
| __ StoreIntoObjectOffset( |
| temp, Field::static_value_offset(), value, CanValueBeSmi()); |
| @@ -2187,7 +2187,7 @@ void LoadFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
| Label load_float32x4; |
| Label load_float64x2; |
| - __ LoadObject(result_reg, Field::ZoneHandle(field()->raw())); |
| + __ LoadObject(result_reg, Field::ZoneHandle(field()->Original())); |
| FieldAddress field_cid_operand( |
| result_reg, Field::guarded_cid_offset(), kUnsignedWord); |