diff options
| author | 2015-04-30 11:23:03 +0000 | |
|---|---|---|
| committer | 2015-04-30 11:23:03 +0000 | |
| commit | caf076311e6933a79da3b5714975486ffa1efa07 (patch) | |
| tree | b53a3ba3a8a4978e372a4e9a657b2c4c5ace7648 /compiler/optimizing/nodes.h | |
| parent | 4ffbc975a8614ed314114895df93c345e14c8163 (diff) | |
| parent | fd5f56d4604eeeacdf6be5189187b6ef49157280 (diff) | |
am fd5f56d4: Merge "Revert "GVN final fields even with side effects.""
* commit 'fd5f56d4604eeeacdf6be5189187b6ef49157280':
Revert "GVN final fields even with side effects."
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 a308844a31..50eecffc57 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -3003,10 +3003,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); } @@ -3416,10 +3414,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); } |