diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-09-18 14:59:11 +0100 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-10-10 16:31:51 +0200 |
| commit | 447aabd4153dad0a15d87d0d92bf3d22fd748967 (patch) | |
| tree | 87000948f71b312fe0d78f37df653e61b6ac26f7 | |
| parent | 3bfc904fec862bbdfc87cb4b2ebe7ee9d66effab (diff) | |
| download | dalvik-linaro_android_4.1.2.tar.gz | |
dalvik: Fix for broswer-crashing buglinaro_android_4.1.2
This applies the fix proposed by Olivier Cozette in
https://code.google.com/p/android/issues/detail?id=37561
and fixes our bug:
https://bugs.launchpad.net/linaro-android/+bug/978060
An alternative fix has been applied since, leaving this one in
as a comment for reference
Change-Id: I54336c83650c1628fd1bb689148bc1dd8843d7c6
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.cpp b/vm/compiler/codegen/arm/CodegenDriver.cpp index 8ebaa7b39..8db96bae2 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.cpp +++ b/vm/compiler/codegen/arm/CodegenDriver.cpp @@ -2833,7 +2833,7 @@ static u8 findPackedSwitchIndex(const u2* switchData, int testVal, uintptr_t pc) } chainingPC += jumpIndex * CHAIN_CELL_NORMAL_SIZE; - return (((u8) caseDPCOffset) << 32) | (u8) chainingPC; + return (((u8) caseDPCOffset) << 32) | (u8) chainingPC; //return (((s8) caseDPCOffset) << 32) | (u8) ((unsigned int)chainingPC); } /* See comments for findPackedSwitchIndex */ |