diff options
| author | Ying Wang <wangying@google.com> | 2012-02-27 10:21:35 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-02-27 11:54:51 -0800 |
| commit | cfead78069f3dc32998dc118ee08cab3867acea2 (patch) | |
| tree | 9600f15eed62fa9ba63ce5894d1f09fe686d5997 /src/proguard/optimize/evaluation/EvaluationSimplifier.java | |
| parent | 10aa7224f49abe49d123bde5d34346202d49aaca (diff) | |
| download | proguard-cfead78069f3dc32998dc118ee08cab3867acea2.tar.gz | |
Upgrade from Progaurd 4.4 to 4.7.
Change-Id: Ie185d0be411a80cc6a330cafa8547252a7dc1d9c
You can find the changelog here
http://proguard.sourceforge.net/#downloads.html
Diffstat (limited to 'src/proguard/optimize/evaluation/EvaluationSimplifier.java')
| -rw-r--r-- | src/proguard/optimize/evaluation/EvaluationSimplifier.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/proguard/optimize/evaluation/EvaluationSimplifier.java b/src/proguard/optimize/evaluation/EvaluationSimplifier.java index 0c3a9c7..b207108 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-2009 Eric Lafortune (eric@graphics.cornell.edu) + * Copyright (c) 2002-2011 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,6 +43,9 @@ 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; /*/ @@ -559,10 +562,11 @@ 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 == 0f || - value == 1f || - value == 2f) + if (value == 0.0f && Float.floatToIntBits(value) == POS_ZERO_FLOAT_BITS || + value == 1.0f || + value == 2.0f) { replaceConstantPushInstruction(clazz, offset, @@ -627,8 +631,9 @@ 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 || + if (value == 0.0 && Double.doubleToLongBits(value) == POS_ZERO_DOUBLE_BITS || value == 1.0) { replaceConstantPushInstruction(clazz, |