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/nodes.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 51c68e93ca..3fe23e1816 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -2993,10 +2993,8 @@ class HInstanceFieldGet : public HExpression<1> { 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 @@ class HStaticFieldGet : public HExpression<1> { 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); } -- cgit v1.2.3