diff options
| author | Bill Buzbee <buzbee@google.com> | 2010-12-27 10:19:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-27 10:19:26 -0800 |
| commit | aa3ce5dd2c7e978681bafedf3363b84df651ad03 (patch) | |
| tree | 27e8078926fc54cfad4410aca539ce1f925b4629 /vm/compiler/codegen | |
| parent | e7bc987434debe66a0631d20d5eddda7d5ce65b9 (diff) | |
| parent | a85893356ac4d86ef7d7dd18807d7bef95d7dddb (diff) | |
| download | android_dalvik-aa3ce5dd2c7e978681bafedf3363b84df651ad03.tar.gz android_dalvik-aa3ce5dd2c7e978681bafedf3363b84df651ad03.tar.bz2 android_dalvik-aa3ce5dd2c7e978681bafedf3363b84df651ad03.zip | |
am a8589335: [Jit] Fix for 3311468 Maps crashed at handleFmt...
* commit 'a85893356ac4d86ef7d7dd18807d7bef95d7dddb':
[Jit] Fix for 3311468 Maps crashed at handleFmt...
Diffstat (limited to 'vm/compiler/codegen')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index 181a128fd..0f6b7e91f 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -3129,8 +3129,6 @@ static bool handleFmt35c_3rc(CompilationUnit *cUnit, MIR *mir, BasicBlock *bb, static bool handleFmt35ms_3rms(CompilationUnit *cUnit, MIR *mir, BasicBlock *bb, ArmLIR *labelList) { - ArmLIR *retChainingCell = &labelList[bb->fallThrough->id]; - ArmLIR *predChainingCell = &labelList[bb->taken->id]; ArmLIR *pcrLabel = NULL; /* An invoke with the MIR_INLINED is effectively a no-op */ @@ -3143,6 +3141,8 @@ static bool handleFmt35ms_3rms(CompilationUnit *cUnit, MIR *mir, case OP_INVOKE_VIRTUAL_QUICK_RANGE: case OP_INVOKE_VIRTUAL_QUICK: { int methodIndex = dInsn->vB; + ArmLIR *retChainingCell = &labelList[bb->fallThrough->id]; + ArmLIR *predChainingCell = &labelList[bb->taken->id]; /* * If the invoke has non-null misPredBranchOver, we need to generate |