From b886da8e3c26443ab4d2aa63268bd673c354c3d2 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Fri, 23 Sep 2011 16:27:54 -0700 Subject: Support for exceptions from array allocation. Adds support for exceptions during array allocation and checked array allocation (used by filled-new-array). Adds more unit tests. Change-Id: I3438b257a1cf19538d8b72529097a74347ac3b99 --- src/compiler/codegen/arm/MethodCodegenDriver.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler/codegen/arm/MethodCodegenDriver.cc') diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc index 595bc986b5..c5241ca005 100644 --- a/src/compiler/codegen/arm/MethodCodegenDriver.cc +++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc @@ -33,7 +33,7 @@ static void genNewArray(CompilationUnit* cUnit, MIR* mir, RegLocation rlDest, { oatFlushAllRegs(cUnit); /* Everything to home location */ loadWordDisp(cUnit, rSELF, - OFFSETOF_MEMBER(Thread, pAllocFromCode), rLR); + OFFSETOF_MEMBER(Thread, pArrayAllocFromCode), rLR); loadCurrMethodDirect(cUnit, r1); // arg1 <- Method* loadConstant(cUnit, r0, mir->dalvikInsn.vC); // arg0 <- type_id loadValueDirectFixed(cUnit, rlSrc, r2); // arg2 <- count @@ -56,7 +56,7 @@ static void genFilledNewArray(CompilationUnit* cUnit, MIR* mir, bool isRange) int typeId = dInsn->vB; oatFlushAllRegs(cUnit); /* Everything to home location */ loadWordDisp(cUnit, rSELF, - OFFSETOF_MEMBER(Thread, pCheckAndAllocFromCode), rLR); + OFFSETOF_MEMBER(Thread, pCheckAndArrayAllocFromCode), rLR); loadCurrMethodDirect(cUnit, r1); // arg1 <- Method* loadConstant(cUnit, r0, typeId); // arg0 <- type_id loadConstant(cUnit, r2, elems); // arg2 <- count -- cgit v1.2.3-59-g8ed1b