/hg/icedtea7-forest/langtools: 74 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 12 17:18:51 UTC 2015
changeset ecfce93b2c96 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=ecfce93b2c96
author: asaha
date: Wed Oct 08 12:20:22 2014 -0700
Added tag jdk7u79-b00 for changeset bdbe862f8846
changeset dd3c897ed9e4 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=dd3c897ed9e4
author: katleman
date: Tue Oct 14 10:33:40 2014 -0700
Added tag jdk7u75-b04 for changeset ecfce93b2c96
changeset 45a01d93e745 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=45a01d93e745
author: asaha
date: Tue Oct 14 12:18:47 2014 -0700
Merge
changeset 9f12b98444b0 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=9f12b98444b0
author: asaha
date: Wed Oct 15 10:51:50 2014 -0700
Merge
changeset cb6ff775d265 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=cb6ff775d265
author: asaha
date: Mon Oct 20 23:07:29 2014 -0700
Merge
changeset 0c3595042012 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=0c3595042012
author: asaha
date: Mon Oct 27 15:21:21 2014 -0700
Merge
changeset 5647df359c82 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=5647df359c82
author: asaha
date: Mon Nov 03 12:45:12 2014 -0800
Merge
changeset ba1dbfde3fc8 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=ba1dbfde3fc8
author: asaha
date: Tue Nov 11 09:15:15 2014 -0800
Merge
changeset 8b791f448871 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=8b791f448871
author: asaha
date: Tue Nov 18 09:01:40 2014 -0800
Merge
changeset f44c10ff4feb in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=f44c10ff4feb
author: asaha
date: Mon Nov 24 21:27:51 2014 -0800
Merge
changeset 3bb5eef377cd in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=3bb5eef377cd
author: asaha
date: Tue Dec 02 12:49:49 2014 -0800
Merge
changeset a01a26976001 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=a01a26976001
author: katleman
date: Mon Nov 10 11:12:31 2014 -0800
Added tag jdk7u72-b32 for changeset 2a4f0a3ead7d
changeset b2cdfe88ceaa in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b2cdfe88ceaa
author: asaha
date: Wed Dec 03 09:24:18 2014 -0800
Merge
changeset 058b66a1b3bd in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=058b66a1b3bd
author: asaha
date: Tue Dec 09 10:57:37 2014 -0800
Merge
changeset 1aef1c42bb78 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=1aef1c42bb78
author: asaha
date: Tue Dec 09 10:32:35 2014 -0800
Added tag jdk7u72-b33 for changeset a01a26976001
changeset 7d090fc16cb6 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=7d090fc16cb6
author: asaha
date: Tue Dec 09 11:20:15 2014 -0800
Merge
changeset 60cbc31b9f6e in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=60cbc31b9f6e
author: asaha
date: Tue Dec 09 11:43:38 2014 -0800
Merge
changeset 8fa35635fddb in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=8fa35635fddb
author: asaha
date: Fri Dec 12 07:09:33 2014 -0800
Added tag jdk7u72-b34 for changeset 1aef1c42bb78
changeset bce7943f72e2 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=bce7943f72e2
author: asaha
date: Fri Dec 12 07:33:43 2014 -0800
Merge
changeset a5f66b87b6c4 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=a5f66b87b6c4
author: asaha
date: Fri Dec 12 07:38:12 2014 -0800
Merge
changeset 2dd89d9db153 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=2dd89d9db153
author: asaha
date: Mon Dec 15 12:10:55 2014 -0800
Added tag jdk7u79-b01 for changeset a5f66b87b6c4
changeset b6830c7fa865 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b6830c7fa865
author: asaha
date: Thu Dec 18 14:22:46 2014 -0800
Merge
changeset b119eb627e10 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b119eb627e10
author: asaha
date: Wed Dec 17 08:44:07 2014 -0800
Added tag jdk7u72-b35 for changeset 8fa35635fddb
changeset c3589e74af0e in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=c3589e74af0e
author: asaha
date: Thu Dec 18 14:38:05 2014 -0800
Merge
changeset 0747b795b08a in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=0747b795b08a
author: asaha
date: Thu Dec 18 14:57:13 2014 -0800
Merge
changeset 5bf43e554b5a in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=5bf43e554b5a
author: asaha
date: Mon Dec 22 11:56:28 2014 -0800
Added tag jdk7u79-b02 for changeset 0747b795b08a
changeset 466551ad752e in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=466551ad752e
author: asaha
date: Mon Dec 29 12:21:50 2014 -0800
Merge
changeset d96eb2eb2eae in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=d96eb2eb2eae
author: asaha
date: Mon Dec 29 14:22:22 2014 -0800
Merge
changeset 9c4eaa276d52 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=9c4eaa276d52
author: asaha
date: Mon Jan 05 12:20:10 2015 -0800
Merge
changeset 01316ccd0f1c in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=01316ccd0f1c
author: asaha
date: Mon Jan 05 12:34:09 2015 -0800
Merge
changeset 87d3e6dac524 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=87d3e6dac524
author: asaha
date: Fri Jan 09 13:59:49 2015 -0800
Merge
changeset 2a9b6cb90976 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=2a9b6cb90976
author: asaha
date: Mon Jan 12 06:52:48 2015 -0800
Added tag jdk7u76-b32 for changeset 9c4eaa276d52
changeset 421c914fbf03 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=421c914fbf03
author: asaha
date: Mon Jan 12 07:58:55 2015 -0800
Merge
changeset f6453624f39f in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=f6453624f39f
author: asaha
date: Mon Jan 12 12:28:20 2015 -0800
Added tag jdk7u79-b03 for changeset 421c914fbf03
changeset 7c626c9382b7 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=7c626c9382b7
author: asaha
date: Tue Jan 20 12:17:10 2015 -0800
Added tag jdk7u79-b06 for changeset f6453624f39f
changeset b3ad79d32b51 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b3ad79d32b51
author: asaha
date: Tue Jan 20 14:00:49 2015 -0800
Merge
changeset a198ad86f4b5 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=a198ad86f4b5
author: asaha
date: Tue Jan 20 15:49:29 2015 -0800
Merge
changeset 335ee524dc68 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=335ee524dc68
author: asaha
date: Wed Jan 21 08:55:14 2015 -0800
Merge
changeset bcdaf1343055 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=bcdaf1343055
author: asaha
date: Thu Jan 22 09:17:56 2015 -0800
Added tag jdk7u80-b06 for changeset 335ee524dc68
changeset c5fb506a4bb6 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=c5fb506a4bb6
author: asaha
date: Mon Jan 26 11:54:06 2015 -0800
Added tag jdk7u79-b07 for changeset 7c626c9382b7
changeset 6f7b359c4e9f in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=6f7b359c4e9f
author: asaha
date: Mon Jan 26 12:14:10 2015 -0800
Merge
changeset b7cbba9273fc in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b7cbba9273fc
author: asaha
date: Mon Jan 26 12:17:50 2015 -0800
Added tag jdk7u80-b07 for changeset 6f7b359c4e9f
changeset 3a870689bd13 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=3a870689bd13
author: pchopra
date: Fri Jan 30 12:38:18 2015 +0300
8064454: [TEST_BUG] Test tools/javac/innerClassFile/Driver.sh fails for Mac and Linux
Reviewed-by: coffeys, mcimadamore
changeset 04176e60f5f5 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=04176e60f5f5
author: asaha
date: Mon Feb 02 12:37:14 2015 -0800
Added tag jdk7u79-b08 for changeset 3a870689bd13
changeset e6db2a97b369 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=e6db2a97b369
author: asaha
date: Mon Feb 02 13:00:18 2015 -0800
Merge
changeset 64c8ed965fb5 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=64c8ed965fb5
author: asaha
date: Mon Feb 02 13:04:06 2015 -0800
Added tag jdk7u80-b08 for changeset e6db2a97b369
changeset 2ea5521a55a3 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=2ea5521a55a3
author: asaha
date: Mon Feb 09 09:09:00 2015 -0800
Added tag jdk7u79-b09 for changeset 04176e60f5f5
changeset 88b7f1ad17d2 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=88b7f1ad17d2
author: asaha
date: Mon Feb 09 09:27:09 2015 -0800
Merge
changeset 2a2921ba02bf in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=2a2921ba02bf
author: asaha
date: Mon Feb 09 15:31:57 2015 -0800
Added tag jdk7u80-b09 for changeset 88b7f1ad17d2
changeset e0d3d80136d7 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=e0d3d80136d7
author: asaha
date: Mon Feb 16 10:46:06 2015 -0800
Added tag jdk7u79-b10 for changeset 2ea5521a55a3
changeset 55f4bb77c71c in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=55f4bb77c71c
author: asaha
date: Mon Feb 16 11:02:11 2015 -0800
Merge
changeset cd14c0b3d053 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=cd14c0b3d053
author: asaha
date: Mon Feb 16 11:07:02 2015 -0800
Added tag jdk7u80-b10 for changeset 55f4bb77c71c
changeset a5f2b51a4ea7 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=a5f2b51a4ea7
author: asaha
date: Tue Feb 24 08:35:05 2015 -0800
Added tag jdk7u79-b11 for changeset e0d3d80136d7
changeset ae5ecf167fb7 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=ae5ecf167fb7
author: asaha
date: Tue Feb 24 09:07:04 2015 -0800
Merge
changeset b19c4a045d66 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b19c4a045d66
author: asaha
date: Tue Feb 24 09:12:44 2015 -0800
Added tag jdk7u80-b11 for changeset ae5ecf167fb7
changeset 525562d90c3c in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=525562d90c3c
author: asaha
date: Mon Mar 02 10:38:53 2015 -0800
Added tag jdk7u79-b12 for changeset a5f2b51a4ea7
changeset c084fb3e3863 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=c084fb3e3863
author: asaha
date: Mon Mar 02 11:01:51 2015 -0800
Merge
changeset 1a5769c9ec6d in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=1a5769c9ec6d
author: asaha
date: Mon Mar 02 11:06:50 2015 -0800
Added tag jdk7u80-b12 for changeset c084fb3e3863
changeset 9a64da81eea4 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=9a64da81eea4
author: asaha
date: Mon Mar 09 12:39:52 2015 -0700
Added tag jdk7u79-b13 for changeset 525562d90c3c
changeset e6845c405f95 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=e6845c405f95
author: asaha
date: Mon Mar 09 14:32:33 2015 -0700
Merge
changeset 7c8b319a6905 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=7c8b319a6905
author: asaha
date: Mon Mar 09 14:38:24 2015 -0700
Added tag jdk7u80-b13 for changeset e6845c405f95
changeset 185113eafdbf in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=185113eafdbf
author: asaha
date: Tue Mar 10 15:41:40 2015 -0700
8074662: Update 3rd party readme and license for LibPNG v 1.6.16
Reviewed-by: jeff
changeset 85832379d0f9 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=85832379d0f9
author: asaha
date: Tue Mar 10 15:49:28 2015 -0700
Merge
changeset 79923da8c058 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=79923da8c058
author: asaha
date: Mon Mar 16 10:49:12 2015 -0700
Added tag jdk7u79-b14 for changeset 185113eafdbf
changeset 242015274be2 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=242015274be2
author: asaha
date: Mon Mar 16 11:03:41 2015 -0700
Merge
changeset 0853c09a66af in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=0853c09a66af
author: asaha
date: Mon Mar 16 11:07:12 2015 -0700
Added tag jdk7u80-b14 for changeset 242015274be2
changeset e5e807700ff8 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=e5e807700ff8
author: asaha
date: Tue Mar 31 11:42:27 2015 -0700
Added tag jdk7u79-b30 for changeset 79923da8c058
changeset d0cc1c8ace99 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=d0cc1c8ace99
author: asaha
date: Tue Mar 31 12:03:10 2015 -0700
Merge
changeset 054a98894f50 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=054a98894f50
author: asaha
date: Tue Mar 31 18:40:33 2015 -0700
Added tag jdk7u80-b30 for changeset d0cc1c8ace99
changeset 000ac84a5aab in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=000ac84a5aab
author: asaha
date: Fri Apr 10 08:51:54 2015 -0700
Added tag jdk7u79-b15 for changeset e5e807700ff8
changeset f2b4d5e42318 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=f2b4d5e42318
author: asaha
date: Fri Apr 10 09:17:27 2015 -0700
Merge
changeset f1ffea3bd4a4 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=f1ffea3bd4a4
author: asaha
date: Fri Apr 10 09:22:56 2015 -0700
Added tag jdk7u80-b15 for changeset f2b4d5e42318
changeset 4af9a5de2a39 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=4af9a5de2a39
author: asaha
date: Fri Apr 10 18:34:11 2015 -0700
Added tag jdk7u80-b32 for changeset f1ffea3bd4a4
changeset 403eeedf70f4 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=403eeedf70f4
author: andrew
date: Fri Jun 12 17:38:34 2015 +0100
Merge jdk7u80-b32
diffstat:
.hgtags | 107 +++
.jcheck/conf | 2 -
THIRD_PARTY_README | 39 +-
make/Makefile | 4 +
make/build.properties | 3 +-
make/build.xml | 2 +-
src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java | 2 +-
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java | 1 -
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java | 4 +-
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java | 4 +-
src/share/classes/com/sun/tools/javac/comp/Check.java | 6 +-
src/share/classes/com/sun/tools/javac/comp/TransTypes.java | 28 +-
src/share/classes/com/sun/tools/javac/jvm/ClassReader.java | 22 +-
src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java | 52 +-
src/share/classes/com/sun/tools/javac/jvm/Code.java | 162 +++++-
src/share/classes/com/sun/tools/javac/jvm/Gen.java | 5 +-
src/share/classes/com/sun/tools/javac/resources/javac_ja.properties | 2 +-
test/Makefile | 3 +
test/com/sun/javadoc/testCharset/TestCharset.java | 82 ++
test/com/sun/javadoc/testCharset/pkg/Foo.java | 26 +
test/tools/javac/6889255/T6889255.java | 6 +-
test/tools/javac/ClassPathTest/ClassPathTest.sh | 9 +-
test/tools/javac/T5090006/broken.jar | Bin
test/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java | 103 +++
test/tools/javac/T8050386/WrongStackframeGenerationTest1.java | 47 +
test/tools/javac/T8050386/WrongStackframeGenerationTest2.java | 50 +
test/tools/javac/annotations/6214965/T6214965.java | 7 +-
test/tools/javac/annotations/6365854/T6365854.java | 10 +-
test/tools/javac/annotations/clinit/AnnoWithClinit1.java | 52 +
test/tools/javac/annotations/clinit/AnnoWithClinitFail.java | 45 +
test/tools/javac/annotations/clinit/AnnoWithClinitFail.out | 3 +
test/tools/javac/flow/DARanges.java | 33 +
test/tools/javac/flow/LVTHarness.java | 290 ++++++++++
test/tools/javac/flow/tests/TestCaseConditional.java | 15 +
test/tools/javac/flow/tests/TestCaseDoLoop.java | 15 +
test/tools/javac/flow/tests/TestCaseFor.java | 29 +
test/tools/javac/flow/tests/TestCaseForEach.java | 15 +
test/tools/javac/flow/tests/TestCaseIf.java | 84 ++
test/tools/javac/flow/tests/TestCaseIfElse.java | 69 ++
test/tools/javac/flow/tests/TestCaseLocalInInnerBlock.java | 20 +
test/tools/javac/flow/tests/TestCaseSwitch.java | 86 ++
test/tools/javac/flow/tests/TestCaseTry.java | 55 +
test/tools/javac/flow/tests/TestCaseWhile.java | 15 +
test/tools/javac/innerClassFile/Driver.sh | 2 +
44 files changed, 1506 insertions(+), 110 deletions(-)
diffs (truncated from 2199 to 500 lines):
diff -r bdbe862f8846 -r 403eeedf70f4 .hgtags
--- a/.hgtags Mon Oct 06 12:50:55 2014 -0700
+++ b/.hgtags Fri Jun 12 17:38:34 2015 +0100
@@ -50,6 +50,7 @@
9596dff460935f09684c11d156ce591f92584f0d jdk7-b73
1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74
2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75
+83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12
8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76
0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
@@ -63,6 +64,7 @@
ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86
409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87
f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88
+681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13
6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89
71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90
97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91
@@ -111,6 +113,7 @@
3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134
9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135
ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
+8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14
a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
@@ -123,6 +126,7 @@
9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01
58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
+fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint
cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02
82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03
baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04
@@ -141,6 +145,7 @@
f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12
f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13
fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21
+58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint
fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02
0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03
f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04
@@ -157,6 +162,7 @@
8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10
4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11
a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12
+e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint
56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13
0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14
0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01
@@ -186,11 +192,15 @@
21d2313dfeac8c52a04b837d13958c86346a4b12 jdk7u6-b10
13d3c624291615593b4299a273085441b1dd2f03 jdk7u6-b11
f0be10a26af08c33d9afe8fe51df29572d431bac jdk7u6-b12
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b01
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b02
+e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b03
fcebf337f5c1d342973573d9c6f758443c8aefcf jdk7u6-b13
35b2699c6243e9fb33648c2c25e97ec91d0e3553 jdk7u6-b14
47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -258,11 +268,13 @@
382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07
7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08
96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09
+85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint
e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10
db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11
f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12
5a52c6cc8db94b68eaacb42a9b4df30a40b09d82 jdk7u14-b13
5febc4e479fad801424cdcce90a0d463a2ef9223 jdk7u14-b14
+d52538e72925a1da7b1fcff051b591beeb2452b4 ppc-aix-port-b04
5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15
1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01
8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02
@@ -382,6 +394,7 @@
ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18
164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30
7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31
+849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33
bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34
efbda7abd821f280ec3a3aa6819ad62d45595e55 jdk7u45-b35
@@ -430,8 +443,11 @@
849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01
954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02
+0d89cc5766d72e870eaf16696ec9b7b1ca4901fd icedtea-2.5pre01
+f75a642c2913e1ecbd22fc46812cffa2e7739169 icedtea-2.5pre02
4170784840d510b4e8ae7ae250b92279aaf5eb25 jdk7u60-b03
772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u60-b04
+702454ac1a074e81890fb07da06ebf00370e42ed icedtea-2.6pre01
744287fccf3b2c4fba2abf105863f0a44c3bd4da jdk7u60-b05
8f6db72756f3e4c3cca8731d20e978fb741846d2 jdk7u60-b06
02f050bc5569fb058ace44ed705bbb0f9022a6fe jdk7u60-b07
@@ -441,7 +457,11 @@
3cc64ba8cf85942929b15c5ef21360f96db3b99c jdk7u60-b11
b79b8b1dc88faa73229b2bce04e979ff5ec854f5 jdk7u60-b12
3dc3e59e9580dfdf95dac57c54fe1a4209401125 jdk7u60-b13
+2040d4afc89815f6bf54a597ff58a70798b68e3d icedtea-2.6pre02
+2950924c2b80dc4d3933a8ab15a0ebb39522da5a icedtea-2.6pre03
a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14
+fa084876cf02f2f9996ad8a0ab353254f92c5564 icedtea-2.6pre04
+5f917c4b87a952a8bf79de08f3e2dd3e56c41657 icedtea-2.6pre05
7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15
057caf9e0774e7c530c5710127f70c8d5f46deab jdk7u60-b16
b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17
@@ -472,6 +492,9 @@
0f809f893588548a3b5c8441e28c9e0a62bc13ef jdk7u65-b18
eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b19
afc940d62b49059f565f87c83343fa3d28df883b jdk7u65-b32
+772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u80-b00
+6c307a0b7a94e002d8a2532ffd8146d6c53f42d3 jdk7u80-b01
+5bd6f3adf690dc2de8881b6f9f48336db4af7865 jdk7u80-b02
114c4fc53777e4067a26f6510fe72fa770a9253c jdk7u65-b20
8a09cca8f12027ba59df4bb18d49e855c4db4811 jdk7u67-b01
eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b40
@@ -523,7 +546,91 @@
cade57461d3b90a59ec62c06d77068b1b73f05b2 jdk7u72-b13
6106b56a874e19e603660a09d506fe8afcde9e14 jdk7u72-b14
7a09f7596c8bb17d3b25b4506dd76425f6efb15e jdk7u72-b30
+de0088aaf97fa861be8c17e97b57139287068c86 jdk7u72-b31
+2a4f0a3ead7dca917132e0bb55157fca5f85e109 jdk7u72-b32
+a01a26976001088d402da55635e00737b529a961 jdk7u72-b33
+1aef1c42bb783a25b54ea786e9bd112a4744e464 jdk7u72-b34
+8fa35635fddba4b0ea01c841c118a841bd6ff34a jdk7u72-b35
0138c5f55af0c700882deeac4411fbd9118b4d6e jdk7u75-b00
7ecfdbf693cfc14d648ebdf2cc87716068569e8d jdk7u75-b01
688a304d3215af8104336ecce50b7f4edfb88d36 jdk7u75-b02
105ad2d2417515b2b595c151e2a5d8ae0fe729eb jdk7u75-b03
+bdbe862f8846558c83f8bc15518446ab0495a173 jdk7u75-b04
+1895dc97d832950fe13a16428b797c952c9e4f4a jdk7u75-b05
+5fcea7a0e4f1e3fa52bd6010e685098731966933 jdk7u75-b06
+2e1c7e887c37dd702b2d09a00dacbafd79604e8c jdk7u75-b07
+fe8e75540f0990c6ad9d060c2343ef896cb5bc19 jdk7u75-b08
+512d77cd143798615266314c72c00ee32500661c jdk7u75-b09
+d77d44ecfb980610de2c90446fab13910ed2c8d7 jdk7u75-b10
+b5554ad39fa33c17033931a4ef5564a9b9d88f05 jdk7u75-b11
+6f369f5322618b48225eebcde52ab9dfa552e286 jdk7u75-b12
+7eb2663b7feb537ca765747e7bd0128245812c64 jdk7u75-b13
+059a87205fda11b19d25ace75698a854aa8edbf3 jdk7u75-b30
+591a7e4cabb5c5efc3ec65128181b38b1fa44a96 jdk7u75-b31
+e77dbc24fcdb5c55f414459798e4c65ed75bf570 jdk7u76-b00
+17aaafb2d1ecb6e2dac5e05cb3198703737e623a jdk7u76-b01
+da47e39ce6680458be011936b89f0946b9587042 jdk7u76-b02
+19a2140056ce1bfa3b6b332d168ad1208bfed1ae jdk7u76-b03
+76969bec514e11903a321f556f38c3be4c2320cf jdk7u76-b04
+ae19a85e5b3864b49b123f54b72de93d13722439 jdk7u76-b05
+b981c087098c8c18f5d2632c02a680ef036217c4 jdk7u76-b06
+b09339e2ca2ac75e5ca29e980eac2e7866e463aa jdk7u76-b07
+23a0bb20d74919861201d0d73cd612cabfd8f1f2 jdk7u76-b08
+853bb5d480cab85c9f9f67ff86f8cb95c31e4885 jdk7u76-b09
+11ca0f4b0c56817f6ad302022e6414aa52582f16 jdk7u76-b10
+63c1f23bddcfc45835f224376525ec621ac73a96 jdk7u76-b11
+f0a6f4f62959a43e21d377436e3e60f6431ee5b4 jdk7u76-b12
+d9e79541170f453dda964319f268fdad80dce9d7 jdk7u76-b13
+24f0420bb212b05d572689bae8ec2d232b9ac5a0 jdk7u76-b30
+f260514e9d6fa7d8c9ee96eb7b5496c61f27d830 jdk7u76-b31
+9c4eaa276d52892371ae4adc79234e8f44c084d2 jdk7u76-b32
+bdbe862f8846558c83f8bc15518446ab0495a173 jdk7u79-b00
+a5f66b87b6c4c14375e8a1aa0405ddb4c63e7014 jdk7u79-b01
+0747b795b08a7de0fbe724cc7042d0e8ebccc4f8 jdk7u79-b02
+421c914fbf030014497053ae58ed7c182043211a jdk7u79-b03
+f6453624f39f9f0922b2746b6f56dcf600a15a4a jdk7u79-b06
+7c626c9382b7705feefb7acfe508ec82d53d7957 jdk7u79-b07
+3a870689bd136b326476a6f21475adc941e33afa jdk7u79-b08
+04176e60f5f58de621a75e5a5c3b59e2d8d00ef7 jdk7u79-b09
+2ea5521a55a35b9700e95d98dc2cf560834b1df6 jdk7u79-b10
+e0d3d80136d7cd11fd26f22fead1f78068fdddaf jdk7u79-b11
+a5f2b51a4ea77cd5471d03501a460c80b375379a jdk7u79-b12
+525562d90c3c06ddc9ef6c266db2d2aa8177b7e0 jdk7u79-b13
+185113eafdbffa675b5db5859ccdd16cfd19ae6f jdk7u79-b14
+79923da8c058124a3a181b9d000753f9b573db35 jdk7u79-b30
+e5e807700ff84f7bd9159ebc828891ae3ddb859c jdk7u79-b15
+772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u80-b00
+6c307a0b7a94e002d8a2532ffd8146d6c53f42d3 jdk7u80-b01
+3eab691bd9ac5222c11dbabb7b5fbc8463c62df6 icedtea-2.6pre07
+f43a81252f827395020fe71099bfa62f2ca0de50 icedtea-2.6pre06
+cdf407c97754412b02ebfdda111319dbd3cb9ca9 icedtea-2.6pre08
+5bd6f3adf690dc2de8881b6f9f48336db4af7865 jdk7u80-b02
+55486a406d9f111eea8996fdf6144befefd86aff icedtea-2.6pre09
+cf836e0ed10de1179ec398a7db323e702b60ca35 icedtea-2.6pre10
+510234036e06ec8d7ed2a39ee11faf1b9a4257b0 icedtea-2.6pre11
+bcbd241df6cd0a643480c8de183c541a662dd506 jdk7u80-b03
+987d772301e91c896178f47f39d82d87e9da1e39 icedtea-2.6pre12
+a072de9f83ed85a6a86d052d13488009230d7d4b icedtea-2.6pre13
+ecf2ec173dd2c19b63d7cf543db23ec7d4f4732a icedtea-2.6pre14
+029dd486cd1a8f6d7684b1633aae41c613055dd2 icedtea-2.6pre15
+c802d4cdd4cbfa8116e4f612cf536de32d67221a icedtea-2.6pre16
+e1dd8fea9abd3663838008063715b4b7ab5a58a4 icedtea-2.6pre17
+04b56f4312b62d8bdf4eb1159132de8437994d34 jdk7u80-b04
+f40fb76025c798cab4fb0e1966be1bceb8234527 jdk7u80-b05
+bb9d09219d3e74954b46ad53cb99dc307e39e120 icedtea-2.6pre18
+4c600e18a7e415702f6a62073c8c60f6b2cbfc11 icedtea-2.6pre19
+1a60fa408f57762abe32f19e4f3d681fb9c4960b icedtea-2.6pre20
+5331b041c88950058f8bd8e9669b9763be6ee03f icedtea-2.6pre21
+a322987c412f5f8584b15fab0a4505b94c016c22 icedtea-2.6pre22
+335ee524dc68a42863f3fa3f081b781586e7ba2d jdk7u80-b06
+6f7b359c4e9f82cbd399edc93c3275c3e668d2ea jdk7u80-b07
+e6db2a97b3696fb5e7786b23f77af346a935a370 jdk7u80-b08
+88b7f1ad17d20eace30d0ab83d4e7413c0c863ff jdk7u80-b09
+55f4bb77c71c8e0b9be2ac6484c7a3838203d53a jdk7u80-b10
+ae5ecf167fb7d70f98aa117ea6a053307db98b14 jdk7u80-b11
+c084fb3e386393774886645aee8ef57b22854c08 jdk7u80-b12
+e6845c405f95b6336e000f054f87a964a33927d9 jdk7u80-b13
+242015274be21260757835134fcfb9bfa5ba6a81 jdk7u80-b14
+d0cc1c8ace99283d7b2354d2c0e5cd58787163c8 jdk7u80-b30
+f2b4d5e42318ed93d35006ff7d1b3b0313b5a71f jdk7u80-b15
+f1ffea3bd4a4df0f74ce0c127aeacf6bd11ee612 jdk7u80-b32
diff -r bdbe862f8846 -r 403eeedf70f4 .jcheck/conf
--- a/.jcheck/conf Mon Oct 06 12:50:55 2014 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r bdbe862f8846 -r 403eeedf70f4 THIRD_PARTY_README
--- a/THIRD_PARTY_README Mon Oct 06 12:50:55 2014 -0700
+++ b/THIRD_PARTY_README Fri Jun 12 17:38:34 2015 +0100
@@ -1001,7 +1001,7 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to libpng 1.5.4, which is
+%% This notice is provided with respect to libpng 1.6.16, which is
included with JRE 7, JDK 7, and OpenJDK 7.
--- begin of LICENSE ---
@@ -1017,7 +1017,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -1115,7 +1115,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-July 7, 2011
+December 22, 2014
--- end of LICENSE ---
@@ -1912,35 +1912,6 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to Sparkle v.1.5,
-which is included with JRE 7 on Mac OS X.
-
---- begin of LICENSE ---
-
-Copyright (c) 2012 Sparkle.org and Andy Matuschak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
%% Portions licensed from Taligent, Inc.
-------------------------------------------------------------------------------
@@ -3198,12 +3169,12 @@
%% This notice is provided with respect to the following which is
included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
- Apache Derby 10.8.3.0 [included with JDK 7 only]
+ Apache Derby 10.8.1.2 [included with JDK 7 only]
Apache Jakarta BCEL 5.2
Apache Jakarta Regexp 1.4
Apache Santuario XMLSec-Java 1.4.2
Apache Xalan-Java 2.7.1
- Apache Xerces2 Java 2.11.0
+ Apache Xerces2 Java 2.10.0
Apache XML Resolver 1.1
diff -r bdbe862f8846 -r 403eeedf70f4 make/Makefile
--- a/make/Makefile Mon Oct 06 12:50:55 2014 -0700
+++ b/make/Makefile Fri Jun 12 17:38:34 2015 +0100
@@ -111,6 +111,10 @@
ANT_OPTIONS += -Ddebug.classfiles=true
endif
+ifeq ($(JAVAC_WARNINGS_FATAL), false)
+ ANT_OPTIONS += -Djavac.warnings.fatal=
+endif
+
# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
# and the somewhat misnamed CLASS_VERSION (-target NN)
ifdef TARGET_CLASS_VERSION
diff -r bdbe862f8846 -r 403eeedf70f4 make/build.properties
--- a/make/build.properties Mon Oct 06 12:50:55 2014 -0700
+++ b/make/build.properties Fri Jun 12 17:38:34 2015 +0100
@@ -68,7 +68,8 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
# in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all,-deprecation -Werror
+javac.warnings.fatal = -Werror
+javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal}
# options for the <javadoc> task for javac
#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
diff -r bdbe862f8846 -r 403eeedf70f4 make/build.xml
--- a/make/build.xml Mon Oct 06 12:50:55 2014 -0700
+++ b/make/build.xml Fri Jun 12 17:38:34 2015 +0100
@@ -877,7 +877,7 @@
</javac>
<taskdef name="genstubs"
classname="GenStubs$$Ant"
- classpath="${build.toolclasses.dir}/"/>
+ classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
</target>
<target name="-def-javadoc-tool" depends="-check-target.java.home">
diff -r bdbe862f8846 -r 403eeedf70f4 src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Mon Oct 06 12:50:55 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Jun 12 17:38:34 2015 +0100
@@ -426,7 +426,7 @@
head.addContent(headComment);
}
if (configuration.charset.length() > 0) {
- Content meta = HtmlTree.META("Content-Type", "text/html",
+ Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
configuration.charset);
head.addContent(meta);
}
diff -r bdbe862f8846 -r 403eeedf70f4 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java Mon Oct 06 12:50:55 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java Fri Jun 12 17:38:34 2015 +0100
@@ -35,7 +35,6 @@
BORDER,
CELLPADDING,
CELLSPACING,
- CHARSET,
CLASS,
CLEAR,
COLS,
diff -r bdbe862f8846 -r 403eeedf70f4 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Mon Oct 06 12:50:55 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Fri Jun 12 17:38:34 2015 +0100
@@ -44,6 +44,8 @@
*/
public abstract class HtmlDocWriter extends HtmlWriter {
+ public static final String CONTENT_TYPE = "text/html";
+
/**
* Constructor. Initializes the destination file name through the super
* class HtmlWriter.
@@ -330,7 +332,7 @@
head.addContent(headComment);
}
if (configuration.charset.length() > 0) {
- Content meta = HtmlTree.META("Content-Type", "text/html",
+ Content meta = HtmlTree.META("Content-Type", CONTENT_TYPE,
configuration.charset);
head.addContent(meta);
}
diff -r bdbe862f8846 -r 403eeedf70f4 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Mon Oct 06 12:50:55 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java Fri Jun 12 17:38:34 2015 +0100
@@ -471,9 +471,9 @@
*/
public static HtmlTree META(String httpEquiv, String content, String charSet) {
HtmlTree htmltree = new HtmlTree(HtmlTag.META);
+ String contentCharset = content + "; charset=" + charSet;
htmltree.addAttr(HtmlAttr.HTTP_EQUIV, nullCheck(httpEquiv));
- htmltree.addAttr(HtmlAttr.CONTENT, nullCheck(content));
- htmltree.addAttr(HtmlAttr.CHARSET, nullCheck(charSet));
+ htmltree.addAttr(HtmlAttr.CONTENT, contentCharset);
return htmltree;
}
diff -r bdbe862f8846 -r 403eeedf70f4 src/share/classes/com/sun/tools/javac/comp/Check.java
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java Mon Oct 06 12:50:55 2014 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java Fri Jun 12 17:38:34 2015 +0100
@@ -2400,9 +2400,9 @@
}
});
for (Scope.Entry e = a.annotationType.type.tsym.members().elems;
- e != null;
- e = e.sibling)
- if (e.sym.kind == MTH)
+ e != null;
+ e = e.sibling)
+ if (e.sym.kind == MTH && e.sym.name != names.clinit)
members.add((MethodSymbol) e.sym);
// count them off as they're annotated
diff -r bdbe862f8846 -r 403eeedf70f4 src/share/classes/com/sun/tools/javac/comp/TransTypes.java
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Mon Oct 06 12:50:55 2014 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Fri Jun 12 17:38:34 2015 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2014, 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
@@ -223,6 +223,12 @@
meth.name,
bridgeType,
origin);
+ /* once JDK-6996415 is solved it should be checked if this approach can
+ * be applied to method addOverrideBridgesIfNeeded
+ */
+ bridge.params = createBridgeParams(impl, bridge, bridgeType);
+ bridge.attributes_field = impl.attributes_field;
+
if (!hypothetical) {
JCMethodDecl md = make.MethodDef(bridge, null);
@@ -257,6 +263,26 @@
overridden.put(bridge, meth);
}
+ private List<VarSymbol> createBridgeParams(MethodSymbol impl, MethodSymbol bridge,
+ Type bridgeType) {
+ List<VarSymbol> bridgeParams = null;
+ if (impl.params != null) {
+ bridgeParams = List.nil();
+ List<VarSymbol> implParams = impl.params;
+ Type.MethodType mType = (Type.MethodType)bridgeType;
+ List<Type> argTypes = mType.argtypes;
+ while (implParams.nonEmpty() && argTypes.nonEmpty()) {
+ VarSymbol param = new VarSymbol(implParams.head.flags() | SYNTHETIC | PARAMETER,
+ implParams.head.name, argTypes.head, bridge);
+ param.attributes_field = implParams.head.attributes_field;
+ bridgeParams = bridgeParams.append(param);
+ implParams = implParams.tail;
+ argTypes = argTypes.tail;
+ }
+ }
+ return bridgeParams;
+ }
+
/** Add bridge if given symbol is a non-private, non-static member
* of the given class, which is either defined in the class or non-final
* inherited, and one of the two following conditions holds:
diff -r bdbe862f8846 -r 403eeedf70f4 src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Mon Oct 06 12:50:55 2014 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Fri Jun 12 17:38:34 2015 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -1541,15 +1541,17 @@
// The method wasn't found: emit a warning and recover
JavaFileObject prevSource = log.useSource(requestingOwner.classfile);
try {
- if (failure == null) {
- log.warning("annotation.method.not.found",
- container,
- name);
- } else {
- log.warning("annotation.method.not.found.reason",
- container,
- name,
- failure.getDetailValue());//diagnostic, if present
+ if (lintClassfile) {
+ if (failure == null) {
+ log.warning("annotation.method.not.found",
+ container,
+ name);
+ } else {
+ log.warning("annotation.method.not.found.reason",
+ container,
+ name,
+ failure.getDetailValue()); //diagnostic, if present
+ }
More information about the distro-pkg-dev
mailing list