Fix OP_FILLED_NEW_ARRAY
The underlying libdex utilities had already normalized the range and
non-range versions of OP_FILLED_NEW_ARRAY, so the code generator shouldn't
look in difference places for the operands.
Change-Id: I59b02d422a424fef6f9c5bf3f6b37b4264f2ac13
diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc
index 9f89ff9..1b7e4ed 100644
--- a/src/compiler/codegen/arm/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc
@@ -52,15 +52,8 @@
static void genFilledNewArray(CompilationUnit* cUnit, MIR* mir, bool isRange)
{
DecodedInstruction* dInsn = &mir->dalvikInsn;
- int elems;
- int typeId;
- if (isRange) {
- elems = dInsn->vA;
- typeId = dInsn->vB;
- } else {
- elems = dInsn->vB;
- typeId = dInsn->vC;
- }
+ int elems = dInsn->vA;
+ int typeId = dInsn->vB;
oatFlushAllRegs(cUnit); /* Everything to home location */
loadWordDisp(cUnit, rSELF,
OFFSETOF_MEMBER(Thread, pCheckAndAllocFromCode), rLR);