/hg/icedtea6: S6796786: invalid FP identity transform - (a - b) ...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Wed Jun 29 03:06:22 PDT 2011
changeset 70ed85d57999 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=70ed85d57999
author: ptisnovs
date: Wed Jun 29 12:06:12 2011 +0200
S6796786: invalid FP identity transform - (a - b) -> b - a S7042070:
Typo in Test6796786.java
diffstat:
ChangeLog | 8 +
Makefile.am | 4 +-
NEWS | 2 +
patches/openjdk/6796786-invalid_FP_identity_transform.patch | 102 ++++++++++++
patches/openjdk/7042070-Typo_in_Test6796786.patch | 32 +++
5 files changed, 147 insertions(+), 1 deletions(-)
diffs (187 lines):
diff -r 3c66636f2c6f -r 70ed85d57999 ChangeLog
--- a/ChangeLog Wed Jun 29 10:26:39 2011 +0200
+++ b/ChangeLog Wed Jun 29 12:06:12 2011 +0200
@@ -1,3 +1,11 @@
+2011-06-29 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patches
+ * NEWS: updated with backports
+ * patches/openjdk/6796786-invalid_FP_identity_transform.patch:
+ * patches/openjdk/7042070-Typo_in_Test6796786.patch:
+ Backport of 6796786 and 7042070 fixes.
+
2011-06-29 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: added new patches
diff -r 3c66636f2c6f -r 70ed85d57999 Makefile.am
--- a/Makefile.am Wed Jun 29 10:26:39 2011 +0200
+++ b/Makefile.am Wed Jun 29 12:06:12 2011 +0200
@@ -371,7 +371,9 @@
patches/support_linux_3.patch \
patches/openjdk/6783910-java_awt_Color_brighter_darker_fix.patch \
patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch \
- patches/openjdk/7047069-Array_can_dynamically_change_size.patch
+ patches/openjdk/7047069-Array_can_dynamically_change_size.patch \
+ patches/openjdk/6796786-invalid_FP_identity_transform.patch \
+ patches/openjdk/7042070-Typo_in_Test6796786.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 3c66636f2c6f -r 70ed85d57999 NEWS
--- a/NEWS Wed Jun 29 10:26:39 2011 +0200
+++ b/NEWS Wed Jun 29 12:06:12 2011 +0200
@@ -42,6 +42,8 @@
- S6783910: java.awt.Color.brighter()/darker() methods make color opaque
- S6785424: SecurityException locating physical fonts on Windows Terminal Server
- S7047069: Array can dynamically change size when assigned to an object field
+ - S6796786: invalid FP identity transform - (a - b) -> b - a
+ - S7042070: Typo in Test6796786.java
* Bug fixes
- PR637: make check should exit with an error code if any regression test failed.
- G356743: Support libpng 1.5.
diff -r 3c66636f2c6f -r 70ed85d57999 patches/openjdk/6796786-invalid_FP_identity_transform.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6796786-invalid_FP_identity_transform.patch Wed Jun 29 12:06:12 2011 +0200
@@ -0,0 +1,105 @@
+# HG changeset patch
+# User never
+# Date 1304449914 25200
+# Node ID f1d6640088a1d3ffc30910e93f1bd782ae74eca9
+# Parent 2e038ad0c1d09407fe8a1627269a5b1c4d163985
+6796786: invalid FP identity transform - (a - b) -> b - a
+Reviewed-by: iveresov, twisti
+
+diff -r 2e038ad0c1d0 -r f1d6640088a1 src/share/vm/opto/subnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/subnode.cpp Mon May 02 18:53:37 2011 -0700
++++ openjdk/hotspot/src/share/vm/opto/subnode.cpp Tue May 03 12:11:54 2011 -0700
+@@ -1223,21 +1223,6 @@
+ }
+
+ //=============================================================================
+-//------------------------------NegNode----------------------------------------
+-Node *NegFNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+- if( in(1)->Opcode() == Op_SubF )
+- return new (phase->C, 3) SubFNode( in(1)->in(2), in(1)->in(1) );
+- return NULL;
+-}
+-
+-Node *NegDNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+- if( in(1)->Opcode() == Op_SubD )
+- return new (phase->C, 3) SubDNode( in(1)->in(2), in(1)->in(1) );
+- return NULL;
+-}
+-
+-
+-//=============================================================================
+ //------------------------------Value------------------------------------------
+ // Compute sqrt
+ const Type *SqrtDNode::Value( PhaseTransform *phase ) const {
+diff -r 2e038ad0c1d0 -r f1d6640088a1 src/share/vm/opto/subnode.hpp
+--- openjdk.orig/hotspot/src/share/vm/opto/subnode.hpp Mon May 02 18:53:37 2011 -0700
++++ openjdk/hotspot/src/share/vm/opto/subnode.hpp Tue May 03 12:11:54 2011 -0700
+@@ -377,7 +377,6 @@
+ public:
+ NegFNode( Node *in1 ) : NegNode(in1) {}
+ virtual int Opcode() const;
+- virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ const Type *bottom_type() const { return Type::FLOAT; }
+ virtual uint ideal_reg() const { return Op_RegF; }
+ };
+@@ -391,7 +390,6 @@
+ public:
+ NegDNode( Node *in1 ) : NegNode(in1) {}
+ virtual int Opcode() const;
+- virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ const Type *bottom_type() const { return Type::DOUBLE; }
+ virtual uint ideal_reg() const { return Op_RegD; }
+ };
+diff -r 2e038ad0c1d0 -r f1d6640088a1 test/compiler/6796786/Test6796786.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/hotspot/test/compiler/6796786/Test6796786.java Tue May 03 12:11:54 2011 -0700
+@@ -0,0 +1,49 @@
++/*
++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ *
++ */
++
++/**
++ * @test
++ * @bug 6796786
++ * @summary invalid FP identity transform - (a - b) -> b - a
++ *
++ * @run main Test6796786
++ */
++
++public class Test6796786 {
++ static volatile float d1;
++ static volatile float d2;
++ static float zero;
++
++ public static void main(String[] args) {
++ int total = 0;
++ for (int i = 0; i < 100000; i++) {
++ if (Float.floatToRawIntBits(- (d1 - d1)) == Float.floatToRawIntBits(0.0f)) {
++ total++;
++ }
++ }
++ if (total != 100000) {
++ throw new InternalError();
++ }
++ }
++}
diff -r 3c66636f2c6f -r 70ed85d57999 patches/openjdk/7042070-Typo_in_Test6796786.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7042070-Typo_in_Test6796786.patch Wed Jun 29 12:06:12 2011 +0200
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User kvn
+# Date 1304574077 25200
+# Node ID 37e4df3c8952604ca0b65d4bbd43aeb2e4b2e68f
+# Parent dcfb3dede00994a52cf5cdc4ac078cee0a1e1b32
+7042070: Typo in Test6796786.java
+Summary: The test should compare with -0.0f.
+Reviewed-by: never, iveresov
+
+diff -r dcfb3dede009 -r 37e4df3c8952 test/compiler/6796786/Test6796786.java
+--- openjdk.orig/hotspot/test/compiler/6796786/Test6796786.java Wed May 04 22:31:18 2011 -0700
++++ openjdk/hotspot/test/compiler/6796786/Test6796786.java Wed May 04 22:41:17 2011 -0700
+@@ -27,18 +27,17 @@
+ * @bug 6796786
+ * @summary invalid FP identity transform - (a - b) -> b - a
+ *
+- * @run main Test6796786
++ * @run main/othervm -Xbatch Test6796786
+ */
+
+ public class Test6796786 {
+ static volatile float d1;
+ static volatile float d2;
+- static float zero;
+
+ public static void main(String[] args) {
+ int total = 0;
+ for (int i = 0; i < 100000; i++) {
+- if (Float.floatToRawIntBits(- (d1 - d1)) == Float.floatToRawIntBits(0.0f)) {
++ if (Float.floatToRawIntBits(- (d1 - d2)) == Float.floatToRawIntBits(-0.0f)) {
+ total++;
+ }
+ }
More information about the distro-pkg-dev
mailing list