diff options
| author | Wei Wang <wangw@codeaurora.org> | 2015-09-09 14:58:02 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:20:37 -0600 |
| commit | 6e037f8660f40fd5869f7a48f27751caaaaa626d (patch) | |
| tree | d3e990d4684841319c8bb7f08fa30c5b428165e0 /compiler/optimizing/nodes.h | |
| parent | c06972f666147061f88aeef265465cb88a27f3b2 (diff) | |
| download | android_art-6e037f8660f40fd5869f7a48f27751caaaaa626d.tar.gz android_art-6e037f8660f40fd5869f7a48f27751caaaaa626d.tar.bz2 android_art-6e037f8660f40fd5869f7a48f27751caaaaa626d.zip | |
ART: bring original constructor back
ART extension changes the constructor of some compiler classes,
which confuses ART compiler test builder. Bring the original
constructor back to make the test build work properly.
Change-Id: I2d6f0a67c2c7bee9d8f67ba55eaa1d5c05449d31
Diffstat (limited to 'compiler/optimizing/nodes.h')
| -rw-r--r-- | compiler/optimizing/nodes.h | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 5d232857ae..a5374302fa 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -3166,6 +3166,15 @@ class HInstanceFieldGet : public HExpression<1> { HInstanceFieldGet(HInstruction* value, Primitive::Type field_type, MemberOffset field_offset, + bool is_volatile) + : HExpression(field_type, SideEffects::DependsOnSomething()), + field_info_(field_offset, field_type, is_volatile, 0) { + SetRawInputAt(0, value); + } + + HInstanceFieldGet(HInstruction* value, + Primitive::Type field_type, + MemberOffset field_offset, bool is_volatile, uint32_t field_idx) : HExpression(field_type, SideEffects::DependsOnSomething()), @@ -3210,6 +3219,17 @@ class HInstanceFieldSet : public HTemplateInstruction<2> { HInstruction* value, Primitive::Type field_type, MemberOffset field_offset, + bool is_volatile) + : HTemplateInstruction(SideEffects::ChangesSomething()), + field_info_(field_offset, field_type, is_volatile, 0) { + SetRawInputAt(0, object); + SetRawInputAt(1, value); + } + + HInstanceFieldSet(HInstruction* object, + HInstruction* value, + Primitive::Type field_type, + MemberOffset field_offset, bool is_volatile, uint32_t field_idx) : HTemplateInstruction(SideEffects::ChangesSomething()), @@ -3592,6 +3612,15 @@ class HStaticFieldGet : public HExpression<1> { HStaticFieldGet(HInstruction* cls, Primitive::Type field_type, MemberOffset field_offset, + bool is_volatile) + : HExpression(field_type, SideEffects::DependsOnSomething()), + field_info_(field_offset, field_type, is_volatile, 0) { + SetRawInputAt(0, cls); + } + + HStaticFieldGet(HInstruction* cls, + Primitive::Type field_type, + MemberOffset field_offset, bool is_volatile, uint32_t field_idx) : HExpression(field_type, SideEffects::DependsOnSomething()), @@ -3632,6 +3661,17 @@ class HStaticFieldSet : public HTemplateInstruction<2> { HInstruction* value, Primitive::Type field_type, MemberOffset field_offset, + bool is_volatile) + : HTemplateInstruction(SideEffects::ChangesSomething()), + field_info_(field_offset, field_type, is_volatile, 0) { + SetRawInputAt(0, cls); + SetRawInputAt(1, value); + } + + HStaticFieldSet(HInstruction* cls, + HInstruction* value, + Primitive::Type field_type, + MemberOffset field_offset, bool is_volatile, uint32_t field_idx) : HTemplateInstruction(SideEffects::ChangesSomething()), |