commit 2af2307f3903a75a379029c049b86f9903fc81a5
author Nicolas Geoffray <ngeoffray@google.com> Thu Apr 30 11:15:40 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Apr 30 11:15:40 2015 +0000
tree 89168f24337d7ec41648568c48b0dd5fb5194c39
parent 781733632637db98d79dfffad72bf063be3259be

Revert "GVN final fields even with side effects."

This reverts commit 781733632637db98d79dfffad72bf063be3259be.

Change-Id: Id7c4591f6b8190921852044b278d11627457c570

compiler/optimizing/builder.cc

diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index c04fe4e..0f44af0 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -816,7 +816,6 @@
         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 @@
     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;