/hg/release/icedtea7-forest-2.4/langtools: 51 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Mon Jul 1 18:29:32 PDT 2013


changeset 1308ff6d5320 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1308ff6d5320
author: katleman
date: Wed Apr 17 12:13:51 2013 -0700

	Added tag jdk7u14-b21 for changeset c31648d7a6ac


changeset eb1c9eacea1f in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=eb1c9eacea1f
author: lana
date: Thu Apr 18 14:42:40 2013 -0700

	Merge


changeset e84535d2c292 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e84535d2c292
author: katleman
date: Wed Apr 24 12:21:43 2013 -0700

	Added tag jdk7u14-b22 for changeset eb1c9eacea1f


changeset d2b78e3b352d in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d2b78e3b352d
author: katleman
date: Wed May 01 14:52:07 2013 -0700

	Added tag jdk7u40-b23 for changeset e84535d2c292


changeset e5635f70fe67 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e5635f70fe67
author: katleman
date: Wed May 08 16:52:49 2013 -0700

	Added tag jdk7u40-b24 for changeset d2b78e3b352d


changeset 5bd6f156bc01 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5bd6f156bc01
author: katleman
date: Thu May 16 12:16:08 2013 -0700

	Added tag jdk7u40-b25 for changeset e5635f70fe67


changeset 12506bba2b67 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=12506bba2b67
author: katleman
date: Wed May 22 16:02:05 2013 -0700

	Added tag jdk7u40-b26 for changeset 5bd6f156bc01


changeset cde77969c47e in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=cde77969c47e
author: katleman
date: Wed May 29 13:24:39 2013 -0700

	Added tag jdk7u40-b27 for changeset 12506bba2b67


changeset 7e2c650b86bc in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7e2c650b86bc
author: mcimadamore
date: Wed May 29 14:49:14 2013 +0100

	7160084: javac fails to compile an apparently valid class/interface combination
	Summary: javac generates wrong syntetized trees for nested enum constants
	Reviewed-by: jjg


changeset 9f2eea2fae59 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=9f2eea2fae59
author: lana
date: Fri May 31 15:44:01 2013 -0700

	Merge


changeset bfe3575143fd in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=bfe3575143fd
author: katleman
date: Wed Jun 05 17:47:02 2013 -0700

	Added tag jdk7u40-b28 for changeset 9f2eea2fae59


changeset 71dbd330abf9 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=71dbd330abf9
author: katleman
date: Wed Jun 12 19:58:37 2013 -0700

	Added tag jdk7u40-b29 for changeset bfe3575143fd


changeset 028d81ce5e5b in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=028d81ce5e5b
author: vromero
date: Sun Jun 02 20:35:27 2013 +0100

	7179353: try-with-resources fails to compile with generic exception parameters
	Reviewed-by: mcimadamore


changeset 333f1369d9fe in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=333f1369d9fe
author: lana
date: Thu Jun 06 19:11:21 2013 -0700

	Merge


changeset d69d7e2d56ee in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d69d7e2d56ee
author: lana
date: Sun Jun 16 22:19:59 2013 -0700

	Merge


changeset 1311e3618232 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1311e3618232
author: katleman
date: Tue Mar 12 14:45:32 2013 -0700

	Added tag jdk7u25-b01 for changeset 884621bb9042


changeset 18678048fc76 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=18678048fc76
author: katleman
date: Tue Mar 19 14:32:03 2013 -0700

	Added tag jdk7u25-b02 for changeset 1311e3618232


changeset 8dc40e209a12 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8dc40e209a12
author: coffeys
date: Thu Mar 21 22:39:38 2013 +0000

	Merge


changeset d7f974b867c4 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=d7f974b867c4
author: katleman
date: Tue Mar 26 14:18:11 2013 -0700

	Added tag jdk7u25-b03 for changeset 8dc40e209a12


changeset 1a955ffd506d in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=1a955ffd506d
author: katleman
date: Tue Apr 02 12:12:31 2013 -0700

	Added tag jdk7u25-b04 for changeset d7f974b867c4


changeset 481a0485b4db in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=481a0485b4db
author: coffeys
date: Fri Apr 05 21:35:21 2013 +0100

	Merge


changeset 5fd3518bb375 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5fd3518bb375
author: katleman
date: Mon Mar 04 14:17:33 2013 -0800

	Added tag jdk7u17-b32 for changeset a91bdaf125d8


changeset 98645465330d in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=98645465330d
author: asaha
date: Mon Apr 08 16:01:09 2013 -0700

	Merge


changeset e8d01d8ee8f5 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e8d01d8ee8f5
author: asaha
date: Mon Apr 08 16:35:49 2013 -0700

	Merge


changeset 25489e38393b in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=25489e38393b
author: katleman
date: Wed Apr 10 12:43:17 2013 -0700

	Added tag jdk7u25-b05 for changeset e8d01d8ee8f5


changeset 11fd425a3ebe in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=11fd425a3ebe
author: katleman
date: Tue Apr 16 11:28:18 2013 -0700

	Added tag jdk7u25-b06 for changeset 25489e38393b


changeset edaa697ef947 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=edaa697ef947
author: katleman
date: Thu Apr 18 11:44:35 2013 -0700

	Added tag jdk7u25-b07 for changeset 11fd425a3ebe


changeset 4dbd21d15a39 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=4dbd21d15a39
author: katleman
date: Tue Apr 23 16:23:22 2013 -0700

	Added tag jdk7u25-b08 for changeset edaa697ef947


changeset 17ee569d0c01 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=17ee569d0c01
author: bpatel
date: Fri Apr 26 15:24:12 2013 -0700

	8012375: Improve Javadoc framing
	Reviewed-by: mduigou, jlaskey


changeset 41c1b02cd6a8 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=41c1b02cd6a8
author: katleman
date: Tue Apr 30 12:25:50 2013 -0700

	Added tag jdk7u25-b09 for changeset 17ee569d0c01


changeset 0da9ef0d9fc5 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0da9ef0d9fc5
author: katleman
date: Tue May 07 12:57:11 2013 -0700

	Added tag jdk7u25-b10 for changeset 41c1b02cd6a8


changeset 28358b2489b2 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=28358b2489b2
author: katleman
date: Wed May 15 13:31:33 2013 -0700

	Added tag jdk7u25-b11 for changeset 0da9ef0d9fc5


changeset 51f9793a6495 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=51f9793a6495
author: asaha
date: Wed May 15 14:28:12 2013 -0700

	Merge


changeset ab04f1711593 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=ab04f1711593
author: asaha
date: Wed May 22 11:59:03 2013 -0700

	Merge


changeset 581244edec38 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=581244edec38
author: asaha
date: Wed Jun 12 09:01:14 2013 -0700

	Merge


changeset 8bf76605342a in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=8bf76605342a
author: asaha
date: Thu Jun 13 17:38:21 2013 -0700

	Merge


changeset 0586afeb2caa in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=0586afeb2caa
author: asaha
date: Mon Jun 17 22:29:34 2013 -0700

	Merge


changeset 849b17bc6e9a in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=849b17bc6e9a
author: katleman
date: Fri Jun 21 11:19:10 2013 -0700

	Added tag jdk7u40-b30 for changeset 0586afeb2caa


changeset 5ed8c4534800 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5ed8c4534800
author: katleman
date: Wed May 22 15:45:12 2013 -0700

	Added tag jdk7u25-b12 for changeset 28358b2489b2


changeset c6342ec6a12f in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=c6342ec6a12f
author: katleman
date: Fri May 24 16:20:45 2013 -0700

	Added tag jdk7u25-b13 for changeset 5ed8c4534800


changeset e1f27e4e180d in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=e1f27e4e180d
author: katleman
date: Tue Jun 04 10:47:59 2013 -0700

	Added tag jdk7u25-b14 for changeset c6342ec6a12f


changeset 3b8323e24a63 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=3b8323e24a63
author: bpatel
date: Wed Jun 05 14:31:54 2013 -0700

	8015998: Additional improvement in Javadoc framing
	Reviewed-by: jjg


changeset 5d95c1e7c091 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=5d95c1e7c091
author: katleman
date: Thu Jun 06 11:41:55 2013 -0700

	Added tag jdk7u25-b15 for changeset 3b8323e24a63


changeset 7294a7be7dbd in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=7294a7be7dbd
author: katleman
date: Tue Jun 11 11:45:38 2013 -0700

	Added tag jdk7u25-b30 for changeset 5d95c1e7c091


changeset aaf5e30d5549 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=aaf5e30d5549
author: katleman
date: Wed Jun 12 20:18:38 2013 -0700

	Added tag jdk7u25-b16 for changeset 7294a7be7dbd


changeset daf200613bbb in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=daf200613bbb
author: katleman
date: Fri Jun 14 18:10:38 2013 -0700

	Added tag jdk7u25-b32 for changeset aaf5e30d5549


changeset 801dc43b8a8f in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=801dc43b8a8f
author: asaha
date: Fri Jun 21 10:56:05 2013 -0700

	Merge


changeset 9c343668b0a9 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=9c343668b0a9
author: asaha
date: Fri Jun 21 19:03:21 2013 -0700

	Merge


changeset 046611513433 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=046611513433
author: andrew
date: Mon Jul 01 09:06:25 2013 -0500

	Merge jdk7u40-b29


changeset 91c95fd8eea8 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=91c95fd8eea8
author: andrew
date: Mon Jul 01 09:22:04 2013 -0500

	Merge jdk7u40-b31


changeset 6f0543ead290 in /hg/release/icedtea7-forest-2.4/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools?cmd=changeset;node=6f0543ead290
author: andrew
date: Tue Jul 02 02:26:35 2013 +0100

	Added tag icedtea-2.4.1 for changeset 91c95fd8eea8


diffstat:

 .hgtags                                                                     |  71 ++++++++++
 .jcheck/conf                                                                |   2 -
 make/Makefile                                                               |   4 +
 make/build.properties                                                       |   3 +-
 make/build.xml                                                              |   2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java |  38 +++++-
 src/share/classes/com/sun/tools/javac/comp/Attr.java                        |  11 +-
 src/share/classes/com/sun/tools/javac/comp/Flow.java                        |  10 +-
 src/share/classes/com/sun/tools/javac/comp/MemberEnter.java                 |   6 +-
 src/share/classes/com/sun/tools/javac/tree/TreeInfo.java                    |   9 +
 test/com/sun/javadoc/testJavascript/TestJavascript.java                     |  42 +++++-
 test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java               |  42 +++++
 test/tools/javac/enum/7160084/T7160084a.java                                |  60 ++++++++
 test/tools/javac/enum/7160084/T7160084b.java                                |  68 +++++++++
 14 files changed, 352 insertions(+), 16 deletions(-)

diffs (truncated from 612 to 500 lines):

diff -r c31648d7a6ac -r 6f0543ead290 .hgtags
--- a/.hgtags	Wed Apr 10 10:30:31 2013 -0700
+++ b/.hgtags	Tue Jul 02 02:26:35 2013 +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
@@ -191,6 +197,7 @@
 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -213,6 +220,8 @@
 0d4cb328938002fa9a2efc8190ea97beae3230a9 jdk7u9-b02
 9148cdb9a18b55ad7d51bb9644b6db812de34eea jdk7u9-b04
 1de4a0865a714076b4922a9a7119adb98aee23f2 jdk7u9-b05
+5d1a6a593fa17933683b34ea3a55c7d13c028a13 jdk7u9-b31
+acd27fc7fcf3e9dc0a1ae7e101cc036e960b6295 jdk7u9-b32
 a35ca56cf8d09b92511f0cd71208a2ea05c8a338 jdk7u8-b01
 41bc8da868e58f7182d26b2ab9b6f8a4b09894ed jdk7u8-b02
 df5cbe436d3460af4667d416877e03400de54524 jdk7u8-b03
@@ -222,9 +231,22 @@
 cd18b83736af19afbccce4b7351c5a3c857356ac jdk7u10-b07
 3204f355a32d83ffceeed1c0c8a52a2d834ae29f jdk7u10-b08
 0b90d3480dbfc16aa3901df249b3cb21bcfa0b32 jdk7u10-b09
+8dfbebb98865d822ddd9e0b9641d21e8bdb8a866 jdk7u10-b10
+01c6dde274bd520067264231b3015c37e8e62d24 jdk7u10-b11
+1fb02747d3bce646374c2cab95048c516cec6b01 jdk7u10-b12
+14735b3d8bdffc7892f1db04b6262bdaad2eb9d7 jdk7u10-b13
+f555fcdbd07156ee11b25fb4ac106065bbf496b4 jdk7u10-b14
+dfcd16ac3fbcabed815b8ef4e792716cce0bce21 jdk7u10-b15
+eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u10-b16
+7101b3e80e96b000b0b4f0bd7fe4dd7910d02f74 jdk7u10-b17
+4f529e320d83f517a55065b4710c7f1e5ff692c9 jdk7u10-b18
+1e5aed8511b9bea5c2ebe51a2d9094be8bac73cc jdk7u10-b30
 87683444edad33cc9f4bbcd9008d98ba34350ded jdk7u12-b01
+db426c20b06918feeeaa036d52a5096c2bb646b0 jdk7u10-b31
 b01338429ab6821f44d19601de433b538942b53d jdk7u11-b20
 aeef1c7e43bc2d4a0960ebf42b642f7a34ec8afc jdk7u11-b21
+92de02b43596ea1d01c87d56dbc9acc0960a90c3 jdk7u11-b32
+309b5ccd0501d48fa7eed29e45197b4101de4683 jdk7u11-b33
 eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u11-b03
 e8071ede35dc5948f5ed127941be192a4a8c1ebd jdk7u11-b04
 17b9bb22f3fd6a624879a29a3fc4b252327c113d jdk7u11-b05
@@ -243,6 +265,7 @@
 382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07
 7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08
 96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09
+85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint
 e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10
 db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11
 f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12
@@ -252,10 +275,46 @@
 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01
 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02
 b00c1580ffa95d9edd567835e1b9a77cf8ca2af6 jdk7u15-b30
+2c82a733594aef14f7a91a910c6b7b20e6220078 jdk7u15-b31
+5639dfc55f771823fab02438e5c89c6b18f57d07 jdk7u15-b33
 c160d7d1616d099afad0986b7d06aee2d9405e57 jdk7u15-b03
 a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u15-b32
 edfcf07c2877af8efa649e514167b22b7f6fc0b4 jdk7u17-b01
 2782a1c60faf7585dee0af0ef585aeed3288e521 jdk7u17-b02
+0abc443a68676c7231b274a324d27204c735acac jdk7u17-b30
+1a9b32d36ff86136549f20156cf3e821295228a0 jdk7u17-b31
+a91bdaf125d89b8b2c6ff86c8055aab3b7d2546c jdk7u17-b32
+8a12629ea21378f96666628f472cd9a6936a4933 jdk7u21-b01
+82103a284427a2512fe884d8f232f1a83d46beb6 jdk7u21-b02
+9adfe6a84c3884d5c24f6655e89546a6e0a80129 jdk7u21-b03
+71704143744ee46f105bf1bf3e4b7aecaf9c1003 jdk7u21-b04
+0970c229028499d5348d77712edf42d712538441 jdk7u21-b05
+5e0127eb56c3f70bdf67a5b2c57cf218838371ae jdk7u21-b06
+08034557136e484b3a7c4d0ec9b21e57ea9cd30b jdk7u21-b07
+f3c75c441d5623186e43de0b5a645e12fc360c29 jdk7u21-b08
+b6c7a18b668b85bdc41914b2b354c1928deb659e jdk7u21-b09
+de06078efe709392d7faf44803d54b74599f6bda jdk7u21-b10
+e120818fc321b5d9d8573a58bf5f6a6eb7471229 jdk7u21-b11
+ff6f8ab2635c6e0b0f6bb1a68dca48b4fc31b107 jdk7u21-b30
+a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b12
+884621bb9042cd4a06e230307f1e26f1c518346d jdk7u25-b01
+1311e3618232058b09fe7ea25eda4af8d3fe6807 jdk7u25-b02
+8dc40e209a12638ea18bb7ee436051768afa5d39 jdk7u25-b03
+d7f974b867c4cf771ab749871c2ff4d3f869f13f jdk7u25-b04
+e8d01d8ee8f547f97d8670157ddf5a798459b85a jdk7u25-b05
+25489e38393b7c70fb826069d50860fbc409d11d jdk7u25-b06
+11fd425a3ebee6fa02bd684d356300b3619e5e7a jdk7u25-b07
+edaa697ef947de30b940bef0a546590d09c99cd3 jdk7u25-b08
+17ee569d0c0130824ba27bc1b090114e6075c5f2 jdk7u25-b09
+41c1b02cd6a8fa7746752cc911da3dd4d380098d jdk7u25-b10
+0da9ef0d9fc5b017f960d65ae0cd07860a259621 jdk7u25-b11
+28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12
+5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13
+c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14
+3b8323e24a636ac0638604d19fc116eb0eef6cdb jdk7u25-b15
+5d95c1e7c0913ad4bc0b5f0b559510d32557def2 jdk7u25-b30
+7294a7be7dbde9c3789f9fa881baa6b8fcd51674 jdk7u25-b16
+aaf5e30d5549ec5200b991806e62db3e866181a7 jdk7u25-b32
 cf80c545434cfe44034e667079673ce42cc9cdbf jdk7u14-b16
 aecd58f25d7f21827ae1b020ae8cfb44857c439f jdk7u14-b17
 577f9625ec558c18e9de6e3428fd0f9cca823033 jdk7u14-b18
@@ -263,3 +322,15 @@
 5168a2c7af619364ddb342674ff880874c3b7897 jdk7u14-b19
 e8c876a77def120b5eeb26535d0777c9b9f842f8 jdk7u14-b19
 86ae75a68cc375cfc0559699b5270951aab09eb0 jdk7u14-b20
+cbb9be4fb46d8dfd3a8c32dc693f9501a64b9a47 icedtea-2.4.0
+c31648d7a6ac692371f1e9abe95bc2856a7dc51c jdk7u14-b21
+eb1c9eacea1f07c07e7e700db624649d3573dae4 jdk7u14-b22
+e84535d2c292032669ac75a6a0afc5f23c708064 jdk7u40-b23
+d2b78e3b352dfb9b0cbd808669f9332e898147ed jdk7u40-b24
+e5635f70fe67192142cb5166bee08cc915a18bc4 jdk7u40-b25
+5bd6f156bc01b6a4e901fc5607663dfc249e9105 jdk7u40-b26
+12506bba2b67cd4b229550da67ff85b984549a28 jdk7u40-b27
+9f2eea2fae59c5242d1bb4cbca967bb6fbb99865 jdk7u40-b28
+bfe3575143fddbf71c2e570b580afef007d171e4 jdk7u40-b29
+0586afeb2caa0b4595bf5b306657a5dd1f0d121c jdk7u40-b30
+91c95fd8eea822b47bcebd7eed22fdf3c404dd62 icedtea-2.4.1
diff -r c31648d7a6ac -r 6f0543ead290 .jcheck/conf
--- a/.jcheck/conf	Wed Apr 10 10:30:31 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r c31648d7a6ac -r 6f0543ead290 make/Makefile
--- a/make/Makefile	Wed Apr 10 10:30:31 2013 -0700
+++ b/make/Makefile	Tue Jul 02 02:26:35 2013 +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 c31648d7a6ac -r 6f0543ead290 make/build.properties
--- a/make/build.properties	Wed Apr 10 10:30:31 2013 -0700
+++ b/make/build.properties	Tue Jul 02 02:26:35 2013 +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 c31648d7a6ac -r 6f0543ead290 make/build.xml
--- a/make/build.xml	Wed Apr 10 10:30:31 2013 -0700
+++ b/make/build.xml	Tue Jul 02 02:26:35 2013 +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 c31648d7a6ac -r 6f0543ead290 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Wed Apr 10 10:30:31 2013 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Jul 02 02:26:35 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -312,8 +312,42 @@
         String scriptCode = DocletConstants.NL + "    targetPage = \"\" + window.location.search;" + DocletConstants.NL +
                 "    if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
                 "        targetPage = targetPage.substring(1);" + DocletConstants.NL +
-                "    if (targetPage.indexOf(\":\") != -1)" + DocletConstants.NL +
+                "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
                 "        targetPage = \"undefined\";" + DocletConstants.NL +
+                "    function validURL(url) {" + DocletConstants.NL +
+                "        var pos = url.indexOf(\".html\");" + DocletConstants.NL +
+                "        if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL +
+                "            return false;" + DocletConstants.NL +
+                "        var allowNumber = false;" + DocletConstants.NL +
+                "        var allowSep = false;" + DocletConstants.NL +
+                "        var seenDot = false;" + DocletConstants.NL +
+                "        for (var i = 0; i < url.length - 5; i++) {" + DocletConstants.NL +
+                "            var ch = url.charAt(i);" + DocletConstants.NL +
+                "            if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL +
+                "                    'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL +
+                "                    ch == '$' ||" + DocletConstants.NL +
+                "                    ch == '_') {" + DocletConstants.NL +
+                "                allowNumber = true;" + DocletConstants.NL +
+                "                allowSep = true;" + DocletConstants.NL +
+                "            } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL +
+                "                    || ch == '-') {" + DocletConstants.NL +
+                "                if (!allowNumber)" + DocletConstants.NL +
+                "                     return false;" + DocletConstants.NL +
+                "            } else if (ch == '/' || ch == '.') {" + DocletConstants.NL +
+                "                if (!allowSep)" + DocletConstants.NL +
+                "                    return false;" + DocletConstants.NL +
+                "                allowNumber = false;" + DocletConstants.NL +
+                "                allowSep = false;" + DocletConstants.NL +
+                "                if (ch == '.')" + DocletConstants.NL +
+                "                     seenDot = true;" + DocletConstants.NL +
+                "                if (ch == '/' && seenDot)" + DocletConstants.NL +
+                "                     return false;" + DocletConstants.NL +
+                "            } else {" + DocletConstants.NL +
+                "                return false;"+ DocletConstants.NL +
+                "            }" + DocletConstants.NL +
+                "        }" + DocletConstants.NL +
+                "        return true;" + DocletConstants.NL +
+                "    }" + DocletConstants.NL +
                 "    function loadFrames() {" + DocletConstants.NL +
                 "        if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
                 "             top.classFrame.location = top.targetPage;" + DocletConstants.NL +
diff -r c31648d7a6ac -r 6f0543ead290 src/share/classes/com/sun/tools/javac/comp/Attr.java
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed Apr 10 10:30:31 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue Jul 02 02:26:35 2013 +0100
@@ -674,6 +674,13 @@
         return t;
     }
 
+    Type attribIdentAsEnumType(Env<AttrContext> env, JCIdent id) {
+        Assert.check((env.enclClass.sym.flags() & ENUM) != 0);
+        id.type = env.info.scope.owner.type;
+        id.sym = env.info.scope.owner;
+        return id.type;
+    }
+
     public void visitClassDef(JCClassDecl tree) {
         // Local classes have not been entered yet, so we need to do it now:
         if ((env.info.scope.owner.kind & (VAR | MTH)) != 0)
@@ -1620,7 +1627,9 @@
 
         // Attribute clazz expression and store
         // symbol + type back into the attributed tree.
-        Type clazztype = attribType(clazz, env);
+        Type clazztype = TreeInfo.isEnumInit(env.tree) ?
+                attribIdentAsEnumType(env, (JCIdent)clazz) :
+                attribType(clazz, env);
         Pair<Scope,Scope> mapping = getSyntheticScopeMapping(clazztype);
         clazztype = chk.checkDiamond(tree, clazztype);
         chk.validate(clazz, localEnv);
diff -r c31648d7a6ac -r 6f0543ead290 src/share/classes/com/sun/tools/javac/comp/Flow.java
--- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	Wed Apr 10 10:30:31 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java	Tue Jul 02 02:26:35 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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
@@ -340,9 +340,10 @@
      */
     void markThrown(JCTree tree, Type exc) {
         if (!chk.isUnchecked(tree.pos(), exc)) {
-            if (!chk.isHandled(exc, caught))
+            if (!chk.isHandled(exc, caught)) {
                 pendingExits.append(new PendingExit(tree, exc));
-                thrown = chk.incl(exc, thrown);
+            }
+            thrown = chk.incl(exc, thrown);
         }
     }
 
@@ -1039,8 +1040,9 @@
                             names.close,
                             List.<Type>nil(),
                             List.<Type>nil());
+                    Type mt = types.memberType(resource.type, closeMethod);
                     if (closeMethod.kind == MTH) {
-                        for (Type t : ((MethodSymbol)closeMethod).getThrownTypes()) {
+                        for (Type t : mt.getThrownTypes()) {
                             markThrown(resource, t);
                         }
                     }
diff -r c31648d7a6ac -r 6f0543ead290 src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
--- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Wed Apr 10 10:30:31 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Tue Jul 02 02:26:35 2013 +0100
@@ -625,7 +625,11 @@
         DeferredLintHandler prevLintHandler =
                 chk.setDeferredLintHandler(deferredLintHandler.setPos(tree.pos()));
         try {
-            attr.attribType(tree.vartype, localEnv);
+            if (TreeInfo.isEnumInit(tree)) {
+                attr.attribIdentAsEnumType(localEnv, (JCIdent)tree.vartype);
+            } else {
+                attr.attribType(tree.vartype, localEnv);
+            }
         } finally {
             chk.setDeferredLintHandler(prevLintHandler);
         }
diff -r c31648d7a6ac -r 6f0543ead290 src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
--- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Wed Apr 10 10:30:31 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Tue Jul 02 02:26:35 2013 +0100
@@ -217,6 +217,15 @@
         }
     }
 
+    public static boolean isEnumInit(JCTree tree) {
+        switch (tree.getTag()) {
+            case JCTree.VARDEF:
+                return (((JCVariableDecl)tree).mods.flags & ENUM) != 0;
+            default:
+                return false;
+        }
+    }
+
     /** Return true if a tree represents the null literal. */
     public static boolean isNull(JCTree tree) {
         if (tree.getTag() != JCTree.LITERAL)
diff -r c31648d7a6ac -r 6f0543ead290 test/com/sun/javadoc/testJavascript/TestJavascript.java
--- a/test/com/sun/javadoc/testJavascript/TestJavascript.java	Wed Apr 10 10:30:31 2013 -0700
+++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java	Tue Jul 02 02:26:35 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4665566 4855876 7025314
+ * @bug      4665566 4855876 7025314 8012375 8015998
  * @summary  Verify that the output has the right javascript.
  * @author   jamieh
  * @library  ../lib/
@@ -35,7 +35,7 @@
 public class TestJavascript extends JavadocTester {
 
     //Test information.
-    private static final String BUG_ID = "4665566-4855876";
+    private static final String BUG_ID = "4665566-4855876-8012375";
 
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
@@ -53,8 +53,42 @@
                         "    targetPage = \"\" + window.location.search;" + NL +
             "    if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
             "        targetPage = targetPage.substring(1);" + NL +
-            "    if (targetPage.indexOf(\":\") != -1)" + NL +
+            "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
             "        targetPage = \"undefined\";" + NL +
+            "    function validURL(url) {" + NL +
+            "        var pos = url.indexOf(\".html\");" + NL +
+            "        if (pos == -1 || pos != url.length - 5)" + NL +
+            "            return false;" + NL +
+            "        var allowNumber = false;" + NL +
+            "        var allowSep = false;" + NL +
+            "        var seenDot = false;" + NL +
+            "        for (var i = 0; i < url.length - 5; i++) {" + NL +
+            "            var ch = url.charAt(i);" + NL +
+            "            if ('a' <= ch && ch <= 'z' ||" + NL +
+            "                    'A' <= ch && ch <= 'Z' ||" + NL +
+            "                    ch == '$' ||" + NL +
+            "                    ch == '_') {" + NL +
+            "                allowNumber = true;" + NL +
+            "                allowSep = true;" + NL +
+            "            } else if ('0' <= ch && ch <= '9'" + NL +
+            "                    || ch == '-') {" + NL +
+            "                if (!allowNumber)" + NL +
+            "                     return false;" + NL +
+            "            } else if (ch == '/' || ch == '.') {" + NL +
+            "                if (!allowSep)" + NL +
+            "                    return false;" + NL +
+            "                allowNumber = false;" + NL +
+            "                allowSep = false;" + NL +
+            "                if (ch == '.')" + NL +
+            "                     seenDot = true;" + NL +
+            "                if (ch == '/' && seenDot)" + NL +
+            "                     return false;" + NL +
+            "            } else {" + NL +
+            "                return false;" + NL +
+            "            }" + NL +
+            "        }" + NL +
+            "        return true;" + NL +
+            "    }" + NL +
             "    function loadFrames() {" + NL +
             "        if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
             "             top.classFrame.location = top.targetPage;" + NL +
diff -r c31648d7a6ac -r 6f0543ead290 test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java	Tue Jul 02 02:26:35 2013 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2013, 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 7179353
+ * @summary try-with-resources fails to compile with generic exception parameters
+ * @compile GenericsAndTWRCompileErrorTest.java
+ */
+
+public class GenericsAndTWRCompileErrorTest {
+
+    public static class Resource<E extends Exception> implements AutoCloseable {
+        public void close() throws E { }
+    }
+
+    public <E extends Exception> void test() throws E {
+        try (Resource<E> r = new Resource<E>()) {
+
+        }
+    }
+}
diff -r c31648d7a6ac -r 6f0543ead290 test/tools/javac/enum/7160084/T7160084a.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/enum/7160084/T7160084a.java	Tue Jul 02 02:26:35 2013 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2012, 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



More information about the distro-pkg-dev mailing list