diff options
| author | Ying Wang <wangying@google.com> | 2012-02-27 18:34:24 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-02-27 18:34:24 -0800 |
| commit | 9f606f95f03a75961498803e24bee6799a7c0885 (patch) | |
| tree | a45f4d74feda9b76277a0c9ced55ad15d82248a1 /src/proguard/optimize/evaluation/EvaluationSimplifier.java | |
| parent | cfead78069f3dc32998dc118ee08cab3867acea2 (diff) | |
| download | android_external_proguard-9f606f95f03a75961498803e24bee6799a7c0885.tar.gz android_external_proguard-9f606f95f03a75961498803e24bee6799a7c0885.tar.bz2 android_external_proguard-9f606f95f03a75961498803e24bee6799a7c0885.zip | |
Revert "Upgrade from Progaurd 4.4 to 4.7."cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingjellybean-stablejellybeancm-10.1
This reverts commit cfead78069f3dc32998dc118ee08cab3867acea2.
Bug: 6079915
Diffstat (limited to 'src/proguard/optimize/evaluation/EvaluationSimplifier.java')
| -rw-r--r-- | src/proguard/optimize/evaluation/EvaluationSimplifier.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/proguard/optimize/evaluation/EvaluationSimplifier.java b/src/proguard/optimize/evaluation/EvaluationSimplifier.java index b207108..0c3a9c7 100644 --- a/src/proguard/optimize/evaluation/EvaluationSimplifier.java +++ b/src/proguard/optimize/evaluation/EvaluationSimplifier.java @@ -2,7 +2,7 @@ * ProGuard -- shrinking, optimization, obfuscation, and preverification * of Java bytecode. * - * Copyright (c) 2002-2011 Eric Lafortune (eric@graphics.cornell.edu) + * Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu) * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -43,9 +43,6 @@ extends SimplifiedVisitor implements AttributeVisitor, InstructionVisitor { - private static int POS_ZERO_FLOAT_BITS = Float.floatToIntBits(0.0f); - private static long POS_ZERO_DOUBLE_BITS = Double.doubleToLongBits(0.0); - //* private static final boolean DEBUG = false; /*/ @@ -562,11 +559,10 @@ implements AttributeVisitor, Value pushedValue = partialEvaluator.getStackAfter(offset).getTop(0); if (pushedValue.isParticular()) { - // Make sure to distinguish between +0.0 and -0.0. float value = pushedValue.floatValue().value(); - if (value == 0.0f && Float.floatToIntBits(value) == POS_ZERO_FLOAT_BITS || - value == 1.0f || - value == 2.0f) + if (value == 0f || + value == 1f || + value == 2f) { replaceConstantPushInstruction(clazz, offset, @@ -631,9 +627,8 @@ implements AttributeVisitor, Value pushedValue = partialEvaluator.getStackAfter(offset).getTop(0); if (pushedValue.isParticular()) { - // Make sure to distinguish between +0.0 and -0.0. double value = pushedValue.doubleValue().value(); - if (value == 0.0 && Double.doubleToLongBits(value) == POS_ZERO_DOUBLE_BITS || + if (value == 0.0 || value == 1.0) { replaceConstantPushInstruction(clazz, |