/hg/icedtea6: S6390045: Unexpected error "cannot access java.lan...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Thu Jul 21 00:42:14 PDT 2011
changeset c2a1c2cf027e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c2a1c2cf027e
author: ptisnovs
date: Thu Jul 21 09:42:07 2011 +0200
S6390045: Unexpected error "cannot access java.lang.Void" with
'-target cldc1.0' with -source >=1.5
diffstat:
ChangeLog | 7 +
Makefile.am | 3 +-
NEWS | 1 +
patches/openjdk/6390045-error_cannot_access_java_lang_void.patch | 101 ++++++++++
4 files changed, 111 insertions(+), 1 deletions(-)
diffs (146 lines):
diff -r 96f22f84fb9d -r c2a1c2cf027e ChangeLog
--- a/ChangeLog Wed Jul 20 10:28:01 2011 +0200
+++ b/ChangeLog Thu Jul 21 09:42:07 2011 +0200
@@ -1,3 +1,10 @@
+2011-07-21 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * NEWS: updated with backport
+ * patches/openjdk/6390045-error_cannot_access_java_lang_void.patch:
+ Backport of 6390045.
+
2011-07-20 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am: added new patch
diff -r 96f22f84fb9d -r c2a1c2cf027e Makefile.am
--- a/Makefile.am Wed Jul 20 10:28:01 2011 +0200
+++ b/Makefile.am Thu Jul 21 09:42:07 2011 +0200
@@ -366,7 +366,8 @@
patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch \
patches/openjdk/7049339-anyblit-broken.patch \
patches/jtreg-hotspot-Test7020373-fix.patch \
- patches/openjdk/4917091-javac_rejects_array_over_128_in_length.patch
+ patches/openjdk/4917091-javac_rejects_array_over_128_in_length.patch \
+ patches/openjdk/6390045-error_cannot_access_java_lang_void.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 96f22f84fb9d -r c2a1c2cf027e NEWS
--- a/NEWS Wed Jul 20 10:28:01 2011 +0200
+++ b/NEWS Thu Jul 21 09:42:07 2011 +0200
@@ -359,6 +359,7 @@
- S7049339: Image copy operations with a custom composite and a complex clip fail.
- S6613904: javax.swing.GroupLayout.createParallelGroup(..) doesn't throw IllegalArgumentException for null arg
- S4917091: javac rejects array over 128 in length
+ - S6390045: Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5
* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
* CACAO
- Threadlist & threadobject improvements.
diff -r 96f22f84fb9d -r c2a1c2cf027e patches/openjdk/6390045-error_cannot_access_java_lang_void.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6390045-error_cannot_access_java_lang_void.patch Thu Jul 21 09:42:07 2011 +0200
@@ -0,0 +1,104 @@
+# HG changeset patch
+# User mcimadamore
+# Date 1249949533 -3600
+# Node ID abe992640c5a766e54f8490cf1d85ff2aacbbb5d
+# Parent d5f6c475f475b905f04446ea54ff455cd9d067fe
+6390045: Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5
+Summary: javac needs to synthetize a fake java.lang.Void symbol if one is not given on the classpath
+Reviewed-by: jjg
+
+diff -r d5f6c475f475 -r abe992640c5a src/share/classes/com/sun/tools/javac/code/Symtab.java
+--- openjdk.orig/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java Tue Aug 11 01:11:37 2009 +0100
++++ openjdk/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java Tue Aug 11 01:12:13 2009 +0100
+@@ -440,6 +440,7 @@
+ synthesizeEmptyInterfaceIfMissing(serializableType);
+ synthesizeBoxTypeIfMissing(doubleType);
+ synthesizeBoxTypeIfMissing(floatType);
++ synthesizeBoxTypeIfMissing(voidType);
+
+ // Enter a synthetic class that is used to mark internal
+ // proprietary classes in ct.sym. This class does not have a
+diff -r d5f6c475f475 -r abe992640c5a test/tools/javac/6390045/T6390045a.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/langtools/test/tools/javac/6390045/T6390045a.java Tue Aug 11 01:12:13 2009 +0100
+@@ -0,0 +1,38 @@
++/*
++ * Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
++ * @test
++ * @bug 6390045
++ * @summary Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5
++ *
++ * @author mcimadamore
++ * @compile -XDfailcomplete=java.lang.Void T6390045a.java
++ */
++
++class T6390045a {
++ boolean b;
++ short s;
++ Object o;
++ Object p = b ? o : s;
++}
+diff -r d5f6c475f475 -r abe992640c5a test/tools/javac/6390045/T6390045b.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/langtools/test/tools/javac/6390045/T6390045b.java Tue Aug 11 01:12:13 2009 +0100
+@@ -0,0 +1,38 @@
++/*
++ * Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
++ * @test
++ * @bug 6390045
++ * @summary Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5
++ *
++ * @author mcimadamore
++ * @compile -XDfailcomplete=java.lang.Void T6390045b.java
++ */
++
++class T6390045b {
++ short s;
++ Object o;
++ Object p = choose(o, s);
++ <T> T choose(T t1, T t2) { return t1; }
++}
More information about the distro-pkg-dev
mailing list