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/nodes.h

diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 51c68e9..3fe23e1 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -2993,10 +2993,8 @@
   HInstanceFieldGet(HInstruction* value,
                     Primitive::Type field_type,
                     MemberOffset field_offset,
-                    bool is_final,
                     bool is_volatile)
-      : HExpression(field_type,
-                    is_final ? SideEffects::None() : SideEffects::DependsOnSomething()),
+      : HExpression(field_type, SideEffects::DependsOnSomething()),
         field_info_(field_offset, field_type, is_volatile) {
     SetRawInputAt(0, value);
   }
@@ -3406,10 +3404,8 @@
   HStaticFieldGet(HInstruction* cls,
                   Primitive::Type field_type,
                   MemberOffset field_offset,
-                  bool is_final,
                   bool is_volatile)
-      : HExpression(field_type,
-                    is_final ? SideEffects::None() : SideEffects::DependsOnSomething()),
+      : HExpression(field_type, SideEffects::DependsOnSomething()),
         field_info_(field_offset, field_type, is_volatile) {
     SetRawInputAt(0, cls);
   }