diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-30 11:15:40 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-30 11:15:40 +0000 |
| commit | 2af2307f3903a75a379029c049b86f9903fc81a5 (patch) | |
| tree | 89168f24337d7ec41648568c48b0dd5fb5194c39 /compiler/optimizing/nodes.h | |
| parent | 781733632637db98d79dfffad72bf063be3259be (diff) | |
| download | android_art-2af2307f3903a75a379029c049b86f9903fc81a5.tar.gz android_art-2af2307f3903a75a379029c049b86f9903fc81a5.tar.bz2 android_art-2af2307f3903a75a379029c049b86f9903fc81a5.zip | |
Revert "GVN final fields even with side effects."
This reverts commit 781733632637db98d79dfffad72bf063be3259be.
Change-Id: Id7c4591f6b8190921852044b278d11627457c570
Diffstat (limited to 'compiler/optimizing/nodes.h')
| -rw-r--r-- | compiler/optimizing/nodes.h | 8 |
1 files changed, 2 insertions, 6 deletions
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); } |