commit 781733632637db98d79dfffad72bf063be3259be
author Nicolas Geoffray <ngeoffray@google.com> Wed Apr 29 16:46:27 2015 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Thu Apr 30 11:20:21 2015 +0100
tree a4ea455e89adb9db77e25525a81737f3b0ab0c58
parent 36ad3f1c3c08a49680a8f5d34bba43199ab9dd5b

GVN final fields even with side effects.

Two accesses of a final field can be GVN'ed even if there are
side effects between them.

Change-Id: I04495ae83c7858f4216b083ad1c29851954320ad

compiler/optimizing/builder.cc

diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index 0f44af0..c04fe4e 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -816,6 +816,7 @@
         current_block_->GetLastInstruction(),
         field_type,
         resolved_field->GetOffset(),
+        resolved_field->IsFinal(),
         resolved_field->IsVolatile()));
 
     UpdateLocal(source_or_dest_reg, current_block_->GetLastInstruction());
@@ -917,13 +918,19 @@
     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->IsVolatile()));
+    current_block_->AddInstruction(new (arena_) HStaticFieldGet(
+        cls,
+        field_type,
+        resolved_field->GetOffset(),
+        resolved_field->IsFinal(),
+        resolved_field->IsVolatile()));
     UpdateLocal(source_or_dest_reg, current_block_->GetLastInstruction());
   }
   return true;