runtime/vm/intermediate_language_arm.cc - Issue 1722733002: In background compilation make a copy of Field in order to freeze its state

Unified Diff: runtime/vm/intermediate_language_arm.cc

Issue 1722733002: In background compilation make a copy of Field in order to freeze its state (Closed) Base URL: git@github.com:dart-lang/sdk.git@master

Patch Set: e Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: runtime/vm/intermediate_language_arm.cc

diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc

index aa8e2dba259f491f9e07db0e39bea66fdddaabfe..91dcbea76735ff58b68aaf478bf59476f3411d8b 100644

--- a/runtime/vm/intermediate_language_arm.cc

+++ b/runtime/vm/intermediate_language_arm.cc

@@ -1610,7 +1610,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());

FieldAddress field_nullability_operand(

@@ -1757,7 +1757,7 @@ void GuardFieldLengthInstr::EmitNativeCode(FlowGraphCompiler* compiler) {

Label ok;

- __ LoadObject(field_reg, Field::ZoneHandle(field().raw()));

+ __ LoadObject(field_reg, Field::ZoneHandle(field().Original()));

__ ldrsb(offset_reg, FieldAddress(field_reg,

Field::guarded_list_length_in_object_offset_offset()));

@@ -2114,7 +2114,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 __ LoadObject(temp, Field::ZoneHandle(compiler->zo

srdjan 2016/02/26 00:40:42 Done.

__ ldrh(temp2, FieldAddress(temp, Field::is_nullable_offset()));

__ CompareImmediate(temp2, kNullCid);

@@ -2254,7 +2254,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.

if (this->value()->NeedsStoreBuffer()) {

__ StoreIntoObject(temp,

FieldAddress(temp, Field::static_value_offset()),

@@ -2476,7 +2476,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());

FieldAddress field_nullability_operand(result_reg,

« runtime/vm/flow_graph_builder.cc ('K') | « runtime/vm/intermediate_language.cc ('k') | runtime/vm/intermediate_language_arm64.cc » ('j') | runtime/vm/intermediate_language_arm64.cc » ('J')