diff options
| author | 2015-04-30 11:35:24 +0000 | |
|---|---|---|
| committer | 2015-04-30 11:35:24 +0000 | |
| commit | 53de3b19a3760bb5fcaa0d34f91a10cb122063ca (patch) | |
| tree | 85363c8b4d677ab20b7dcb61345483c2feac47d1 /compiler/optimizing/builder.cc | |
| parent | ddadbf8d3328f810c0b59ab1f8b2685108ad048c (diff) | |
| parent | caf076311e6933a79da3b5714975486ffa1efa07 (diff) | |
am caf07631: am fd5f56d4: Merge "Revert "GVN final fields even with side effects.""
* commit 'caf076311e6933a79da3b5714975486ffa1efa07':
Revert "GVN final fields even with side effects."
Diffstat (limited to 'compiler/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index c04fe4ec76..0f44af07b8 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -816,7 +816,6 @@ bool HGraphBuilder::BuildInstanceFieldAccess(const Instruction& instruction, current_block_->GetLastInstruction(), field_type, resolved_field->GetOffset(), - resolved_field->IsFinal(), resolved_field->IsVolatile())); UpdateLocal(source_or_dest_reg, current_block_->GetLastInstruction()); @@ -918,19 +917,13 @@ bool HGraphBuilder::BuildStaticFieldAccess(const Instruction& instruction, temps.Add(cls); HInstruction* value = LoadLocal(source_or_dest_reg, field_type); DCHECK_EQ(value->GetType(), field_type); - current_block_->AddInstruction(new (arena_) HStaticFieldSet( - cls, - value, - field_type, - resolved_field->GetOffset(), - resolved_field->IsVolatile())); + current_block_->AddInstruction( + new (arena_) HStaticFieldSet(cls, value, field_type, resolved_field->GetOffset(), + resolved_field->IsVolatile())); } else { - current_block_->AddInstruction(new (arena_) HStaticFieldGet( - cls, - field_type, - resolved_field->GetOffset(), - resolved_field->IsFinal(), - resolved_field->IsVolatile())); + current_block_->AddInstruction( + new (arena_) HStaticFieldGet(cls, field_type, resolved_field->GetOffset(), + resolved_field->IsVolatile())); UpdateLocal(source_or_dest_reg, current_block_->GetLastInstruction()); } return true; |