From fbdaa30a448029d75422c76f29087a4e39630f4a Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 29 May 2015 12:06:56 +0100 Subject: Use the new HCurrentMethod in HLoadString. Change-Id: I23d27e5e10736d127519eb3238ff8f25df3843a2 --- compiler/optimizing/nodes.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'compiler/optimizing/nodes.h') diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 869809d69f..3144c5c193 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -3544,12 +3544,14 @@ class HLoadClass : public HExpression<1> { DISALLOW_COPY_AND_ASSIGN(HLoadClass); }; -class HLoadString : public HExpression<0> { +class HLoadString : public HExpression<1> { public: - HLoadString(uint32_t string_index, uint32_t dex_pc) + HLoadString(HCurrentMethod* current_method, uint32_t string_index, uint32_t dex_pc) : HExpression(Primitive::kPrimNot, SideEffects::None()), string_index_(string_index), - dex_pc_(dex_pc) {} + dex_pc_(dex_pc) { + SetRawInputAt(0, current_method); + } bool CanBeMoved() const OVERRIDE { return true; } -- cgit v1.2.3-59-g8ed1b