Reviewer needed: backport of javac fix into IcedTea6 HEAD (6390045: Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5)

Dr Andrew John Hughes ahughes at redhat.com
Wed Jul 20 06:08:53 PDT 2011 

On 14:08 Wed 20 Jul     , Jiri Vanek wrote:
> 
> Hi!
> 
> Patch itself looks good, but it is not applicable. It is funny taht this one is in collision with your last commit:D
> When patch corrected for head, then worked fine (f13 x86_64).
> Adapt to head and  feel free to commit.
> 

Please don't top-post.

> J.
> 
> On 07/20/2011 01:33 PM, Pavel Tisnovsky wrote:
> > Greetings,
> >
> > is it possible to backport following java compiler fix into IcedTea6
> > HEAD please?
> >
> > It's this fix: '6390045: Unexpected error "cannot access java.lang.Void"
> > with '-target cldc1.0' with -source>=1.5' which can be checked by the
> > regression test contained in the patch itself (it's already checked on
> > RHEL 5 x86_64, of course).
> >
> > ChangeLog entry:
> >
> > 2011-07-20  Pavel Tisnovsky<ptisnovs at redhat.com>
> >
> >          * Makefile.am: added new patch
> 
> FYI... or just to think about - maybe you can start to write here properly  * Makefile.am:(target)added new patch_WHICh_one.patch - even when it is written as new file, below.
> But it will duplicate information in news. Its an question where this should belongs. (There is me the One who do not know).

Well the patch being added is the one in the ChangeLog...

> 
> >          * NEWS: updated with backport
>                                              ^^^ again, maybe some info which one. and why.
> >          * patches/openjdk/6390045-error_cannot_access_java_lang_void.patch:
> >          Backport of 6390045.

^^ i.e. here.

> >
> >
> > Can anybody please review this change?
> >

Looks ok, but check the indentation in NEWS.

> > Thank you in advance,
> > Pavel
> >
> >
> > 6390045_hg_diff.patch
> >
> >
> > diff -r 406c0d434ca3 Makefile.am
> > --- a/Makefile.am	Fri Jul 15 08:53:07 2011 -0400
> > +++ b/Makefile.am	Mon Jul 18 19:13:56 2011 +0200
> > @@ -365,7 +365,8 @@
> >   	patches/openjdk/6758179-D3D_AlphaComposite_is_applied_incorrectly.patch \
> >   	patches/jtreg-ConstructDeflaterInput-fix.patch \
> >   	patches/openjdk/6613904-GroupLayout_createParallelGroup_null_arg.patch \
> > -	patches/openjdk/7049339-anyblit-broken.patch
> > +	patches/openjdk/7049339-anyblit-broken.patch \
> > +	patches/openjdk/6390045-error_cannot_access_java_lang_void.patch
> >
> >   if WITH_RHINO
> >   ICEDTEA_PATCHES += \
> > diff -r 406c0d434ca3 NEWS
> > --- a/NEWS	Fri Jul 15 08:53:07 2011 -0400
> > +++ b/NEWS	Mon Jul 18 19:13:56 2011 +0200
> > @@ -358,6 +358,7 @@
> >     - S6758179: D3D: AlphaComposite is applied incorrectly for uncached opaque BufferedImage
> >     - 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
> > +  - S6390045: Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source>=1.5

Indentation error here?

> >   * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
> >   * CACAO
> >     - Threadlist&  threadobject improvements.
> > diff -r 406c0d434ca3 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	Mon Jul 18 19:13:56 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 visitwww.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 visitwww.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; }
> > ++}
> 

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37

More information about the distro-pkg-dev mailing list