diff options
| author | 2015-04-30 11:16:06 +0000 | |
|---|---|---|
| committer | 2015-04-30 11:16:06 +0000 | |
| commit | fd5f56d4604eeeacdf6be5189187b6ef49157280 (patch) | |
| tree | b53a3ba3a8a4978e372a4e9a657b2c4c5ace7648 /compiler/optimizing/builder.cc | |
| parent | 56784f887bad1219f326e9e6d110f785f31a5968 (diff) | |
| parent | 2af2307f3903a75a379029c049b86f9903fc81a5 (diff) | |
Merge "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; |