/hg/icedtea6: Patches to remove regression tests which are not v...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Mon Mar 7 09:46:00 PST 2011
changeset 115b18bbcedb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=115b18bbcedb
author: ptisnovs
date: Mon Mar 07 18:49:08 2011 +0100
Patches to remove regression tests which are not valid in OpenJDK6.
diffstat:
ChangeLog | 12 +
Makefile.am | 4 +-
patches/jtreg-remove-test-6987555.patch | 183 ++++++++++++
patches/jtreg-remove-test-6991596.patch | 471 ++++++++++++++++++++++++++++++++
4 files changed, 669 insertions(+), 1 deletions(-)
diffs (truncated from 697 to 500 lines):
diff -r 55bfe07e584d -r 115b18bbcedb ChangeLog
--- a/ChangeLog Fri Mar 04 16:09:19 2011 +0100
+++ b/ChangeLog Mon Mar 07 18:49:08 2011 +0100
@@ -1,3 +1,15 @@
+2011-03-07 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Added two new patches.
+ * patches/jtreg-remove-test-6987555.patch:
+ Patch to remove regression test
+ hotspot/test/compiler/6987555/Test6987555
+ which is not valid for OpenJDK6
+ * patches/jtreg-remove-test-6991596.patch:
+ Patch to remove regression test
+ hotspot/test/compiler/6991596/Test6991596
+ which is not valid for OpenJDK6
+
2011-02-24 Matthias Klose <doko at ubuntu.com>
* Makefile.am (jtregcheck): Allow setting which tests to run.
diff -r 55bfe07e584d -r 115b18bbcedb Makefile.am
--- a/Makefile.am Fri Mar 04 16:09:19 2011 +0100
+++ b/Makefile.am Mon Mar 07 18:49:08 2011 +0100
@@ -324,7 +324,9 @@
patches/openjdk/6766342-AA-simple-shape-performance.patch \
patches/openjdk/7016856-pisces-performance.patch \
patches/openjdk/6934977-MappedByteBuffer.load.patch \
- patches/jaxp-serial-version-uid.patch
+ patches/jaxp-serial-version-uid.patch \
+ patches/jtreg-remove-test-6987555.patch \
+ patches/jtreg-remove-test-6991596.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r 55bfe07e584d -r 115b18bbcedb patches/jtreg-remove-test-6987555.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-remove-test-6987555.patch Mon Mar 07 18:49:08 2011 +0100
@@ -0,0 +1,184 @@
+The regression test openjdk/hotspot/test/compiler/6987555/Test6987555.java is
+based on JSR-292 which is not part of OpenJDK6 - this means this test should be
+removed.
+
+--- openjdk/hotspot/test/compiler/6987555/Test6987555.java 2011-02-22 17:51:24.000000000 +0100
++++ /dev/null 2010-06-29 10:52:54.337250608 +0200
+@@ -1,177 +0,0 @@
+-/*
+- * Copyright (c) 2010, 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 6987555
+- * @summary JSR 292 unboxing to a boolean value fails on big-endian SPARC
+- *
+- * @run main/othervm -Xint -ea -XX:+UnlockExperimentalVMOptions -XX:+EnableMethodHandles -XX:+EnableInvokeDynamic -XX:+UnlockDiagnosticVMOptions -XX:+VerifyMethodHandles Test6987555
+- */
+-
+-import java.dyn.*;
+-
+-public class Test6987555 {
+- private static final Class CLASS = Test6987555.class;
+- private static final String NAME = "foo";
+- private static final boolean DEBUG = false;
+-
+- public static void main(String[] args) throws Throwable {
+- testboolean();
+- testbyte();
+- testchar();
+- testshort();
+- testint();
+- }
+-
+- // boolean
+- static void testboolean() throws Throwable {
+- doboolean(false);
+- doboolean(true);
+- }
+- static void doboolean(boolean x) throws Throwable {
+- if (DEBUG) System.out.println("boolean=" + x);
+- MethodHandle mh1 = MethodHandles.lookup().findStatic(CLASS, NAME, MethodType.methodType(boolean.class, boolean.class));
+- MethodHandle mh2 = mh1.asType(MethodType.methodType(boolean.class, Boolean.class));
+- boolean a = mh1.<boolean>invokeExact(x);
+- boolean b = mh2.<boolean>invokeExact(Boolean.valueOf(x));
+- assert a == b : a + " != " + b;
+- }
+-
+- // byte
+- static void testbyte() throws Throwable {
+- byte[] a = new byte[] {
+- Byte.MIN_VALUE,
+- Byte.MIN_VALUE + 1,
+- -0x0F,
+- -1,
+- 0,
+- 1,
+- 0x0F,
+- Byte.MAX_VALUE - 1,
+- Byte.MAX_VALUE
+- };
+- for (int i = 0; i < a.length; i++) {
+- dobyte(a[i]);
+- }
+- }
+- static void dobyte(byte x) throws Throwable {
+- if (DEBUG) System.out.println("byte=" + x);
+- MethodHandle mh1 = MethodHandles.lookup().findStatic(CLASS, NAME, MethodType.methodType(byte.class, byte.class));
+- MethodHandle mh2 = mh1.asType(MethodType.methodType(byte.class, Byte.class));
+- byte a = mh1.<byte>invokeExact(x);
+- byte b = mh2.<byte>invokeExact(Byte.valueOf(x));
+- assert a == b : a + " != " + b;
+- }
+-
+- // char
+- static void testchar() throws Throwable {
+- char[] a = new char[] {
+- Character.MIN_VALUE,
+- Character.MIN_VALUE + 1,
+- 0x000F,
+- 0x00FF,
+- 0x0FFF,
+- Character.MAX_VALUE - 1,
+- Character.MAX_VALUE
+- };
+- for (int i = 0; i < a.length; i++) {
+- dochar(a[i]);
+- }
+- }
+- static void dochar(char x) throws Throwable {
+- if (DEBUG) System.out.println("char=" + x);
+- MethodHandle mh1 = MethodHandles.lookup().findStatic(CLASS, NAME, MethodType.methodType(char.class, char.class));
+- MethodHandle mh2 = mh1.asType(MethodType.methodType(char.class, Character.class));
+- char a = mh1.<char>invokeExact(x);
+- char b = mh2.<char>invokeExact(Character.valueOf(x));
+- assert a == b : a + " != " + b;
+- }
+-
+- // short
+- static void testshort() throws Throwable {
+- short[] a = new short[] {
+- Short.MIN_VALUE,
+- Short.MIN_VALUE + 1,
+- -0x0FFF,
+- -0x00FF,
+- -0x000F,
+- -1,
+- 0,
+- 1,
+- 0x000F,
+- 0x00FF,
+- 0x0FFF,
+- Short.MAX_VALUE - 1,
+- Short.MAX_VALUE
+- };
+- for (int i = 0; i < a.length; i++) {
+- doshort(a[i]);
+- }
+- }
+- static void doshort(short x) throws Throwable {
+- if (DEBUG) System.out.println("short=" + x);
+- MethodHandle mh1 = MethodHandles.lookup().findStatic(CLASS, NAME, MethodType.methodType(short.class, short.class));
+- MethodHandle mh2 = mh1.asType(MethodType.methodType(short.class, Short.class));
+- short a = mh1.<short>invokeExact(x);
+- short b = mh2.<short>invokeExact(Short.valueOf(x));
+- assert a == b : a + " != " + b;
+- }
+-
+- // int
+- static void testint() throws Throwable {
+- int[] a = new int[] {
+- Integer.MIN_VALUE,
+- Integer.MIN_VALUE + 1,
+- -0x00000FFF,
+- -0x000000FF,
+- -0x0000000F,
+- -1,
+- 0,
+- 1,
+- 0x0000000F,
+- 0x000000FF,
+- 0x00000FFF,
+- Integer.MAX_VALUE - 1,
+- Integer.MAX_VALUE
+- };
+- for (int i = 0; i < a.length; i++) {
+- doint(a[i]);
+- }
+- }
+- static void doint(int x) throws Throwable {
+- if (DEBUG) System.out.println("int=" + x);
+- MethodHandle mh1 = MethodHandles.lookup().findStatic(CLASS, NAME, MethodType.methodType(int.class, int.class));
+- MethodHandle mh2 = mh1.asType(MethodType.methodType(int.class, Integer.class));
+- int a = mh1.<int>invokeExact(x);
+- int b = mh2.<int>invokeExact(Integer.valueOf(x));
+- assert a == b : a + " != " + b;
+- }
+-
+- public static boolean foo(boolean i) { return i; }
+- public static byte foo(byte i) { return i; }
+- public static char foo(char i) { return i; }
+- public static short foo(short i) { return i; }
+- public static int foo(int i) { return i; }
+-}
diff -r 55bfe07e584d -r 115b18bbcedb patches/jtreg-remove-test-6991596.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-remove-test-6991596.patch Mon Mar 07 18:49:08 2011 +0100
@@ -0,0 +1,472 @@
+The regression test openjdk/hotspot/test/compiler/6991596/Test6991596.java is
+based on JSR-292 which is not part of OpenJDK6 - this means this test should be
+removed.
+
+--- openjdk/hotspot/test/compiler/6991596/Test6991596.java 2011-02-22 17:51:24.000000000 +0100
++++ /dev/null 2010-06-29 10:52:54.337250608 +0200
+@@ -1,465 +0,0 @@
+-/*
+- * Copyright (c) 2010, 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 6991596
+- * @summary JSR 292 unimplemented adapter_opt_i2i and adapter_opt_l2i on SPARC
+- *
+- * @run main/othervm -ea -XX:+UnlockExperimentalVMOptions -XX:+EnableMethodHandles -XX:+EnableInvokeDynamic -XX:+UnlockDiagnosticVMOptions -XX:+VerifyMethodHandles Test6991596
+- */
+-
+-import java.dyn.*;
+-
+-public class Test6991596 {
+- private static final Class CLASS = Test6991596.class;
+- private static final String NAME = "foo";
+- private static final boolean DEBUG = System.getProperty("DEBUG", "false").equals("true");
+-
+- public static void main(String[] args) throws Throwable {
+- testboolean();
+- testbyte();
+- testchar();
+- testshort();
+- testint();
+- testlong();
+- }
+-
+- // Helpers to get various methods.
+- static MethodHandle getmh1(Class ret, Class arg) throws NoAccessException {
+- return MethodHandles.lookup().findStatic(CLASS, NAME, MethodType.methodType(ret, arg));
+- }
+- static MethodHandle getmh2(MethodHandle mh1, Class ret, Class arg) {
+- return MethodHandles.convertArguments(mh1, MethodType.methodType(ret, arg));
+- }
+- static MethodHandle getmh3(MethodHandle mh1, Class ret, Class arg) {
+- return MethodHandles.convertArguments(mh1, MethodType.methodType(ret, arg));
+- }
+-
+- // test adapter_opt_i2i
+- static void testboolean() throws Throwable {
+- boolean[] a = new boolean[] {
+- true,
+- false
+- };
+- for (int i = 0; i < a.length; i++) {
+- doboolean(a[i]);
+- }
+- }
+- static void doboolean(boolean x) throws Throwable {
+- if (DEBUG) System.out.println("boolean=" + x);
+-
+- // boolean
+- {
+- MethodHandle mh1 = getmh1( boolean.class, boolean.class);
+- MethodHandle mh2 = getmh2(mh1, boolean.class, boolean.class);
+- // TODO add this for all cases when the bugs are fixed.
+- //MethodHandle mh3 = getmh3(mh1, boolean.class, boolean.class);
+- boolean a = (boolean) mh1.invokeExact((boolean) x);
+- boolean b = (boolean) mh2.invokeExact(x);
+- //boolean c = mh3.<boolean>invokeExact((boolean) x);
+- check(x, a, b);
+- //check(x, c, x);
+- }
+-
+- // byte
+- {
+- MethodHandle mh1 = getmh1( byte.class, byte.class );
+- MethodHandle mh2 = getmh2(mh1, byte.class, boolean.class);
+- byte a = (byte) mh1.invokeExact((byte) (x ? 1 : 0));
+- byte b = (byte) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // char
+- {
+- MethodHandle mh1 = getmh1( char.class, char.class);
+- MethodHandle mh2 = getmh2(mh1, char.class, boolean.class);
+- char a = (char) mh1.invokeExact((char) (x ? 1 : 0));
+- char b = (char) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // short
+- {
+- MethodHandle mh1 = getmh1( short.class, short.class);
+- MethodHandle mh2 = getmh2(mh1, short.class, boolean.class);
+- short a = (short) mh1.invokeExact((short) (x ? 1 : 0));
+- short b = (short) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+- }
+-
+- static void testbyte() throws Throwable {
+- byte[] a = new byte[] {
+- Byte.MIN_VALUE,
+- Byte.MIN_VALUE + 1,
+- -0x0F,
+- -1,
+- 0,
+- 1,
+- 0x0F,
+- Byte.MAX_VALUE - 1,
+- Byte.MAX_VALUE
+- };
+- for (int i = 0; i < a.length; i++) {
+- dobyte(a[i]);
+- }
+- }
+- static void dobyte(byte x) throws Throwable {
+- if (DEBUG) System.out.println("byte=" + x);
+-
+- // boolean
+- {
+- MethodHandle mh1 = getmh1( boolean.class, boolean.class);
+- MethodHandle mh2 = getmh2(mh1, boolean.class, byte.class);
+- boolean a = (boolean) mh1.invokeExact((x & 1) == 1);
+- boolean b = (boolean) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // byte
+- {
+- MethodHandle mh1 = getmh1( byte.class, byte.class);
+- MethodHandle mh2 = getmh2(mh1, byte.class, byte.class);
+- byte a = (byte) mh1.invokeExact((byte) x);
+- byte b = (byte) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // char
+- {
+- MethodHandle mh1 = getmh1( char.class, char.class);
+- MethodHandle mh2 = getmh2(mh1, char.class, byte.class);
+- char a = (char) mh1.invokeExact((char) x);
+- char b = (char) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // short
+- {
+- MethodHandle mh1 = getmh1( short.class, short.class);
+- MethodHandle mh2 = getmh2(mh1, short.class, byte.class);
+- short a = (short) mh1.invokeExact((short) x);
+- short b = (short) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+- }
+-
+- static void testchar() throws Throwable {
+- char[] a = new char[] {
+- Character.MIN_VALUE,
+- Character.MIN_VALUE + 1,
+- 0x000F,
+- 0x00FF,
+- 0x0FFF,
+- Character.MAX_VALUE - 1,
+- Character.MAX_VALUE
+- };
+- for (int i = 0; i < a.length; i++) {
+- dochar(a[i]);
+- }
+- }
+- static void dochar(char x) throws Throwable {
+- if (DEBUG) System.out.println("char=" + x);
+-
+- // boolean
+- {
+- MethodHandle mh1 = getmh1( boolean.class, boolean.class);
+- MethodHandle mh2 = getmh2(mh1, boolean.class, char.class);
+- boolean a = (boolean) mh1.invokeExact((x & 1) == 1);
+- boolean b = (boolean) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // byte
+- {
+- MethodHandle mh1 = getmh1( byte.class, byte.class);
+- MethodHandle mh2 = getmh2(mh1, byte.class, char.class);
+- byte a = (byte) mh1.invokeExact((byte) x);
+- byte b = (byte) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // char
+- {
+- MethodHandle mh1 = getmh1( char.class, char.class);
+- MethodHandle mh2 = getmh2(mh1, char.class, char.class);
+- char a = (char) mh1.invokeExact((char) x);
+- char b = (char) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // short
+- {
+- MethodHandle mh1 = getmh1( short.class, short.class);
+- MethodHandle mh2 = getmh2(mh1, short.class, char.class);
+- short a = (short) mh1.invokeExact((short) x);
+- short b = (short) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+- }
+-
+- static void testshort() throws Throwable {
+- short[] a = new short[] {
+- Short.MIN_VALUE,
+- Short.MIN_VALUE + 1,
+- -0x0FFF,
+- -0x00FF,
+- -0x000F,
+- -1,
+- 0,
+- 1,
+- 0x000F,
+- 0x00FF,
+- 0x0FFF,
+- Short.MAX_VALUE - 1,
+- Short.MAX_VALUE
+- };
+- for (int i = 0; i < a.length; i++) {
+- doshort(a[i]);
+- }
+- }
+- static void doshort(short x) throws Throwable {
+- if (DEBUG) System.out.println("short=" + x);
+-
+- // boolean
+- {
+- MethodHandle mh1 = getmh1( boolean.class, boolean.class);
+- MethodHandle mh2 = getmh2(mh1, boolean.class, short.class);
+- boolean a = (boolean) mh1.invokeExact((x & 1) == 1);
+- boolean b = (boolean) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // byte
+- {
+- MethodHandle mh1 = getmh1( byte.class, byte.class);
+- MethodHandle mh2 = getmh2(mh1, byte.class, short.class);
+- byte a = (byte) mh1.invokeExact((byte) x);
+- byte b = (byte) mh2.invokeExact(x);
+- check(x, a, b);
+- }
+-
+- // char
+- {
+- MethodHandle mh1 = getmh1( char.class, char.class);
+- MethodHandle mh2 = getmh2(mh1, char.class, short.class);
More information about the distro-pkg-dev
mailing list