diff options
Diffstat (limited to 'runtime/dex_instruction_test.cc')
| -rw-r--r-- | runtime/dex_instruction_test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/dex_instruction_test.cc b/runtime/dex_instruction_test.cc index 3f7ac57cef..48ed027882 100644 --- a/runtime/dex_instruction_test.cc +++ b/runtime/dex_instruction_test.cc @@ -15,6 +15,7 @@ */ #include "dex_instruction-inl.h" +#include "dex_instruction_iterator.h" #include "gtest/gtest.h" namespace art { @@ -73,7 +74,7 @@ TEST(Instruction, PropertiesOf45cc) { Build45cc(4u /* num_vregs */, 16u /* method_idx */, 32u /* proto_idx */, 0xcafe /* arg_regs */, instruction); - const Instruction* ins = Instruction::At(instruction); + DexInstructionIterator ins(instruction); ASSERT_EQ(4u, ins->SizeInCodeUnits()); ASSERT_TRUE(ins->HasVRegA()); @@ -108,7 +109,7 @@ TEST(Instruction, PropertiesOf4rcc) { Build4rcc(4u /* num_vregs */, 16u /* method_idx */, 32u /* proto_idx */, 0xcafe /* arg_regs */, instruction); - const Instruction* ins = Instruction::At(instruction); + DexInstructionIterator ins(instruction); ASSERT_EQ(4u, ins->SizeInCodeUnits()); ASSERT_TRUE(ins->HasVRegA()); @@ -154,7 +155,7 @@ static std::string DumpInst35c(Instruction::Code code, std::vector<uint16_t> args) { uint16_t inst[6] = {}; Build35c(inst, code, method_idx, args); - return Instruction::At(inst)->DumpString(nullptr); + return DexInstructionIterator(inst)->DumpString(nullptr); } TEST(Instruction, DumpString) { |