From 2af2307f3903a75a379029c049b86f9903fc81a5 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 30 Apr 2015 11:15:40 +0000 Subject: Revert "GVN final fields even with side effects." This reverts commit 781733632637db98d79dfffad72bf063be3259be. Change-Id: Id7c4591f6b8190921852044b278d11627457c570 --- compiler/optimizing/builder.cc | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'compiler/optimizing/builder.cc') 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; -- cgit v1.2.3-59-g8ed1b