summaryrefslogtreecommitdiff
path: root/compiler/optimizing/nodes.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2015-04-30 10:31:49 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-30 10:31:49 +0000
commit4ffbc975a8614ed314114895df93c345e14c8163 (patch)
tree42225647869863b4c79d537639bc1fb4ea5fdf7f /compiler/optimizing/nodes.h
parentf94b250f426c7f43f9ee78e39e07d6ee13842b20 (diff)
parent56784f887bad1219f326e9e6d110f785f31a5968 (diff)
am 56784f88: Merge "GVN final fields even with side effects."
* commit '56784f887bad1219f326e9e6d110f785f31a5968': GVN final fields even with side effects.
Diffstat (limited to 'compiler/optimizing/nodes.h')
-rw-r--r--compiler/optimizing/nodes.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 50eecffc57..a308844a31 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -3003,8 +3003,10 @@ class HInstanceFieldGet : public HExpression<1> {
HInstanceFieldGet(HInstruction* value,
Primitive::Type field_type,
MemberOffset field_offset,
+ bool is_final,
bool is_volatile)
- : HExpression(field_type, SideEffects::DependsOnSomething()),
+ : HExpression(field_type,
+ is_final ? SideEffects::None() : SideEffects::DependsOnSomething()),
field_info_(field_offset, field_type, is_volatile) {
SetRawInputAt(0, value);
}
@@ -3414,8 +3416,10 @@ class HStaticFieldGet : public HExpression<1> {
HStaticFieldGet(HInstruction* cls,
Primitive::Type field_type,
MemberOffset field_offset,
+ bool is_final,
bool is_volatile)
- : HExpression(field_type, SideEffects::DependsOnSomething()),
+ : HExpression(field_type,
+ is_final ? SideEffects::None() : SideEffects::DependsOnSomething()),
field_info_(field_offset, field_type, is_volatile) {
SetRawInputAt(0, cls);
}