/hg/icedtea7-forest/langtools: 90 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Wed Feb 4 16:56:00 UTC 2015


changeset 9755f64a08e2 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=9755f64a08e2
author: jfranck
date: Wed May 08 14:10:53 2013 +0200

	8013485: javac can't handle annotations with a <clinit> from a previous compilation unit
	Reviewed-by: mcimadamore


changeset 20376611cb3b in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=20376611cb3b
author: lana
date: Thu Nov 20 14:01:11 2014 -0800

	Merge


changeset 979f55cda0e2 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=979f55cda0e2
author: robm
date: Wed Nov 26 17:03:13 2014 +0000

	8065674: javac generates incorrect LVT table for trivial cases
	Reviewed-by: jjg
	Contributed-by: vicente.romero at oracle.com


changeset 04b56f4312b6 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=04b56f4312b6
author: vromero
date: Thu Dec 11 18:06:50 2014 +0000

	6695379: Copy method annotations and parameter annotations to synthetic bridge methods
	Reviewed-by: mcimadamore


changeset 072aeca12bf3 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=072aeca12bf3
author: katleman
date: Tue Jan 06 13:32:25 2015 -0800

	Added tag jdk7u80-b04 for changeset 04b56f4312b6


changeset 08c11954963e in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=08c11954963e
author: darcy
date: Thu Jan 08 11:16:54 2015 -0800

	8068639: Make certain annotation classfile warnings opt-in
	Reviewed-by: jjg


changeset c230c9f59bef in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=c230c9f59bef
author: lana
date: Mon Jan 12 14:31:32 2015 -0800

	Merge


changeset e2f8c29685a8 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=e2f8c29685a8
author: asaha
date: Thu Aug 28 13:57:55 2014 -0700

	Merge


changeset 068ca4e694a6 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=068ca4e694a6
author: asaha
date: Wed Sep 03 22:40:50 2014 -0700

	Added tag jdk7u76-b00 for changeset e77dbc24fcdb


changeset 17aaafb2d1ec in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=17aaafb2d1ec
author: asaha
date: Wed Sep 03 22:57:48 2014 -0700

	Merge


changeset da47e39ce668 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=da47e39ce668
author: asaha
date: Mon Sep 22 11:21:51 2014 -0700

	Added tag jdk7u76-b01 for changeset 17aaafb2d1ec


changeset 19a2140056ce in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=19a2140056ce
author: asaha
date: Thu Oct 02 10:02:55 2014 -0700

	Added tag jdk7u76-b02 for changeset da47e39ce668


changeset 5b6fcc841684 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=5b6fcc841684
author: asaha
date: Mon Oct 06 12:22:17 2014 -0700

	Added tag jdk7u76-b03 for changeset 19a2140056ce


changeset 021790aeaefe in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=021790aeaefe
author: asaha
date: Tue Jul 08 09:36:35 2014 -0700

	Added tag jdk7u75-b00 for changeset 0138c5f55af0


changeset 6b6a416c20f5 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=6b6a416c20f5
author: asaha
date: Mon Jul 14 13:38:35 2014 -0700

	Merge


changeset db8de81f3ea0 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=db8de81f3ea0
author: asaha
date: Tue Jul 22 10:30:21 2014 -0700

	Merge


changeset 9ef7693b10dc in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=9ef7693b10dc
author: coffeys
date: Thu Aug 07 12:20:30 2014 +0100

	Merge


changeset 9c1265a426a8 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=9c1265a426a8
author: mfang
date: Mon Aug 18 10:33:38 2014 -0700

	8055176: 7u71 l10n resource file translation update
	Reviewed-by: yhuang


changeset 56924493868e in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=56924493868e
author: asaha
date: Tue Aug 19 07:03:04 2014 -0700

	Merge


changeset 50f5f45ef7ff in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=50f5f45ef7ff
author: asaha
date: Tue Aug 26 11:28:10 2014 -0700

	Merge


changeset 6df29ac646cc in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=6df29ac646cc
author: asaha
date: Tue Sep 02 13:16:29 2014 -0700

	Merge


changeset 892f6def12b2 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=892f6def12b2
author: asaha
date: Mon Sep 08 13:55:57 2014 -0700

	Merge


changeset e3b604d29f91 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=e3b604d29f91
author: alitvinov
date: Thu Jul 31 16:03:30 2014 +0400

	Merge


changeset e6bf55d45701 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=e6bf55d45701
author: lana
date: Fri Aug 01 10:21:26 2014 -0700

	Added tag jdk7u67-b31 for changeset e3b604d29f91


changeset 624c54795faa in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=624c54795faa
author: asaha
date: Mon Aug 25 15:33:20 2014 -0700

	Added tag jdk7u67-b32 for changeset e6bf55d45701


changeset 18077957a8b8 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=18077957a8b8
author: katleman
date: Tue Sep 09 13:20:21 2014 -0700

	Added tag jdk7u67-b33 for changeset 624c54795faa


changeset d0be1453588c in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=d0be1453588c
author: asaha
date: Thu Sep 11 11:06:35 2014 -0700

	Merge


changeset c45db576fe9d in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=c45db576fe9d
author: asaha
date: Fri Sep 12 15:36:19 2014 -0700

	Merge


changeset 6ab830d83d98 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=6ab830d83d98
author: asaha
date: Mon Sep 22 09:40:17 2014 -0700

	Added tag jdk7u67-b34 for changeset 18077957a8b8


changeset 7ecfdbf693cf in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=7ecfdbf693cf
author: asaha
date: Mon Sep 22 09:57:14 2014 -0700

	Merge


changeset b67e9998236e in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b67e9998236e
author: asaha
date: Mon Sep 22 11:13:23 2014 -0700

	Added tag jdk7u75-b01 for changeset 7ecfdbf693cf


changeset 688a304d3215 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=688a304d3215
author: asaha
date: Fri Sep 26 11:12:09 2014 -0700

	Merge


changeset 60f1f86994e1 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=60f1f86994e1
author: asaha
date: Mon Sep 29 11:29:08 2014 -0700

	Added tag jdk7u75-b02 for changeset 688a304d3215


changeset 3ee9c8714ae6 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=3ee9c8714ae6
author: asaha
date: Thu Oct 02 08:33:05 2014 -0700

	Merge


changeset 428e573b61c1 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=428e573b61c1
author: asaha
date: Thu Oct 02 08:42:02 2014 -0700

	Merge


changeset 0560fba0bc3a in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=0560fba0bc3a
author: asaha
date: Thu Oct 02 08:47:30 2014 -0700

	Merge


changeset de0088aaf97f in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=de0088aaf97f
author: asaha
date: Mon Oct 06 12:16:56 2014 -0700

	Merge


changeset 105ad2d24175 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=105ad2d24175
author: asaha
date: Mon Oct 06 12:46:20 2014 -0700

	Merge


changeset bdbe862f8846 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=bdbe862f8846
author: asaha
date: Mon Oct 06 12:50:55 2014 -0700

	Added tag jdk7u75-b03 for changeset 105ad2d24175


changeset c56259ce2b6f in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=c56259ce2b6f
author: asaha
date: Fri Oct 10 08:51:12 2014 -0700

	Merge


changeset 51ec721d6cf7 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=51ec721d6cf7
author: asaha
date: Mon Oct 13 12:15:13 2014 -0700

	Added tag jdk7u75-b04 for changeset bdbe862f8846


changeset 76969bec514e in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=76969bec514e
author: asaha
date: Mon Oct 13 14:00:31 2014 -0700

	Merge


changeset e1ba5223fd3a in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=e1ba5223fd3a
author: asaha
date: Mon Oct 13 15:12:49 2014 -0700

	Added tag jdk7u76-b04 for changeset 76969bec514e


changeset 2a4f0a3ead7d in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=2a4f0a3ead7d
author: katleman
date: Wed Oct 08 13:02:33 2014 -0700

	Added tag jdk7u72-b31 for changeset de0088aaf97f


changeset 1895dc97d832 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=1895dc97d832
author: asaha
date: Wed Oct 15 10:40:59 2014 -0700

	Merge


changeset 05acb0a440ae in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=05acb0a440ae
author: asaha
date: Wed Oct 15 10:46:45 2014 -0700

	Merge


changeset 5fcea7a0e4f1 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=5fcea7a0e4f1
author: asaha
date: Mon Oct 20 12:36:32 2014 -0700

	Added tag jdk7u75-b05 for changeset 1895dc97d832


changeset ae19a85e5b38 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=ae19a85e5b38
author: asaha
date: Mon Oct 20 13:26:50 2014 -0700

	Merge


changeset d83c66f066c7 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=d83c66f066c7
author: asaha
date: Mon Oct 20 13:32:05 2014 -0700

	Added tag jdk7u76-b05 for changeset ae19a85e5b38


changeset 2e1c7e887c37 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=2e1c7e887c37
author: asaha
date: Mon Oct 27 12:22:28 2014 -0700

	Added tag jdk7u75-b06 for changeset 5fcea7a0e4f1


changeset b981c087098c in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b981c087098c
author: asaha
date: Mon Oct 27 12:38:41 2014 -0700

	Merge


changeset fee7f42c76fb in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=fee7f42c76fb
author: asaha
date: Mon Oct 27 12:42:32 2014 -0700

	Added tag jdk7u76-b06 for changeset b981c087098c


changeset 7f2aa6e9d42b in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=7f2aa6e9d42b
author: asaha
date: Tue Oct 28 15:05:40 2014 -0700

	Merge


changeset fe8e75540f09 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=fe8e75540f09
author: asaha
date: Mon Nov 03 12:13:35 2014 -0800

	Added tag jdk7u75-b07 for changeset 2e1c7e887c37


changeset b09339e2ca2a in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b09339e2ca2a
author: asaha
date: Mon Nov 03 12:24:37 2014 -0800

	Merge


changeset 36be61b9fa46 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=36be61b9fa46
author: asaha
date: Mon Nov 03 12:27:16 2014 -0800

	Added tag jdk7u76-b07 for changeset b09339e2ca2a


changeset 512d77cd1437 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=512d77cd1437
author: asaha
date: Mon Nov 10 11:43:12 2014 -0800

	Added tag jdk7u75-b08 for changeset fe8e75540f09


changeset 23a0bb20d749 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=23a0bb20d749
author: asaha
date: Mon Nov 10 11:51:16 2014 -0800

	Merge


changeset 6a7c33b18619 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=6a7c33b18619
author: asaha
date: Mon Nov 10 11:54:00 2014 -0800

	Added tag jdk7u76-b08 for changeset 23a0bb20d749


changeset c4bdb75dee28 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=c4bdb75dee28
author: asaha
date: Mon Nov 17 12:10:53 2014 -0800

	Added tag jdk7u75-b09 for changeset 512d77cd1437


changeset 853bb5d480ca in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=853bb5d480ca
author: asaha
date: Mon Nov 17 12:35:09 2014 -0800

	Merge


changeset c7cb362c9878 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=c7cb362c9878
author: asaha
date: Mon Nov 17 12:39:00 2014 -0800

	Added tag jdk7u76-b09 for changeset 853bb5d480ca


changeset e75c6d18b45c in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=e75c6d18b45c
author: mfang
date: Mon Nov 24 10:17:10 2014 -0800

	8065609: 7u76 l10n resource file translation update
	Reviewed-by: yhuang


changeset d77d44ecfb98 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=d77d44ecfb98
author: mfang
date: Mon Nov 24 10:03:13 2014 -0800

	8065608: 7u75 l10n resource file translation update
	Reviewed-by: yhuang


changeset 48e64f8388a9 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=48e64f8388a9
author: asaha
date: Mon Nov 24 11:53:28 2014 -0800

	Merge


changeset b5554ad39fa3 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=b5554ad39fa3
author: asaha
date: Mon Nov 24 13:26:39 2014 -0800

	Added tag jdk7u75-b10 for changeset d77d44ecfb98


changeset 11ca0f4b0c56 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=11ca0f4b0c56
author: asaha
date: Mon Nov 24 13:37:12 2014 -0800

	Merge


changeset f4c6d187d832 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=f4c6d187d832
author: asaha
date: Mon Nov 24 13:40:24 2014 -0800

	Added tag jdk7u76-b10 for changeset 11ca0f4b0c56


changeset 6f369f532261 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=6f369f532261
author: asaha
date: Tue Dec 02 10:34:34 2014 -0800

	Added tag jdk7u75-b11 for changeset b5554ad39fa3


changeset 63c1f23bddcf in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=63c1f23bddcf
author: asaha
date: Tue Dec 02 10:51:41 2014 -0800

	Merge


changeset 99f76e72cddb in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=99f76e72cddb
author: asaha
date: Tue Dec 02 10:54:47 2014 -0800

	Added tag jdk7u76-b11 for changeset 63c1f23bddcf


changeset 7eb2663b7feb in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=7eb2663b7feb
author: asaha
date: Mon Dec 08 12:30:04 2014 -0800

	Added tag jdk7u75-b12 for changeset 6f369f532261


changeset f0a6f4f62959 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=f0a6f4f62959
author: asaha
date: Mon Dec 08 12:56:59 2014 -0800

	Merge


changeset 56706a5a12ad in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=56706a5a12ad
author: asaha
date: Mon Dec 08 13:00:35 2014 -0800

	Added tag jdk7u76-b12 for changeset f0a6f4f62959


changeset 059a87205fda in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=059a87205fda
author: asaha
date: Thu Dec 18 14:00:13 2014 -0800

	Added tag jdk7u75-b13 for changeset 7eb2663b7feb


changeset d9e79541170f in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=d9e79541170f
author: asaha
date: Thu Dec 18 14:10:51 2014 -0800

	Merge


changeset 4acdd23d4f36 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=4acdd23d4f36
author: asaha
date: Thu Dec 18 14:14:03 2014 -0800

	Added tag jdk7u76-b13 for changeset d9e79541170f


changeset 894e78f7b990 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=894e78f7b990
author: asaha
date: Tue Dec 23 14:05:23 2014 -0800

	Merge


changeset 07b55b6d8b62 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=07b55b6d8b62
author: asaha
date: Wed Jan 07 12:23:49 2015 -0800

	Merge


changeset 591a7e4cabb5 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=591a7e4cabb5
author: asaha
date: Mon Dec 29 11:43:10 2014 -0800

	Added tag jdk7u75-b30 for changeset 059a87205fda


changeset 24f0420bb212 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=24f0420bb212
author: asaha
date: Mon Dec 29 11:56:31 2014 -0800

	Merge


changeset 154a2e45e8d4 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=154a2e45e8d4
author: asaha
date: Mon Dec 29 12:03:40 2014 -0800

	Added tag jdk7u76-b30 for changeset 24f0420bb212


changeset 4d3ec83b2b5a in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=4d3ec83b2b5a
author: asaha
date: Mon Jan 05 11:44:23 2015 -0800

	Added tag jdk7u75-b31 for changeset 591a7e4cabb5


changeset f260514e9d6f in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=f260514e9d6f
author: asaha
date: Mon Jan 05 12:00:55 2015 -0800

	Merge


changeset 7800634757b9 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=7800634757b9
author: asaha
date: Mon Jan 05 12:04:50 2015 -0800

	Added tag jdk7u76-b31 for changeset f260514e9d6f


changeset eebb57a5431f in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=eebb57a5431f
author: asaha
date: Wed Jan 07 12:35:59 2015 -0800

	Merge


changeset f40fb76025c7 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=f40fb76025c7
author: asaha
date: Fri Jan 16 13:35:30 2015 -0800

	Merge


changeset 66326158f20b in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=66326158f20b
author: asaha
date: Wed Jan 21 08:23:01 2015 -0800

	Added tag jdk7u80-b05 for changeset f40fb76025c7


changeset bb9d09219d3e in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=bb9d09219d3e
author: andrew
date: Thu Jan 29 22:20:25 2015 +0000

	Merge jdk7u80-b05


changeset 4c600e18a7e4 in /hg/icedtea7-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=4c600e18a7e4
author: andrew
date: Wed Feb 04 16:52:14 2015 +0000

	Added tag icedtea-2.6pre18 for changeset bb9d09219d3e


diffstat:

 .hgtags                                                                   |   77 ++
 .jcheck/conf                                                              |    2 -
 make/Makefile                                                             |    4 +
 make/build.properties                                                     |    3 +-
 make/build.xml                                                            |    2 +-
 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/resources/javac_ja.properties       |    2 +-
 test/Makefile                                                             |    3 +
 test/tools/javac/6889255/T6889255.java                                    |    6 +-
 test/tools/javac/T5090006/broken.jar                                      |  Bin 
 test/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java |  103 +++
 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 +
 32 files changed, 1246 insertions(+), 69 deletions(-)

diffs (truncated from 1751 to 500 lines):

diff -r bcbd241df6cd -r 4c600e18a7e4 .hgtags
--- a/.hgtags	Tue Oct 07 12:59:24 2014 -0700
+++ b/.hgtags	Wed Feb 04 16:52:14 2015 +0000
@@ -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,11 +492,19 @@
 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
 5e4cc118e2d1f7a8eefca5dd7146d46a1b0ca911 jdk7u65-b31
 59575d1928f98d1e26ea548ff4d5e2415dfe9b57 jdk7u65-b33
+8a09cca8f12027ba59df4bb18d49e855c4db4811 jdk7u67-b01
+e3b604d29f9177ac0c1344cdb7af8f5ccdc1db42 jdk7u67-b31
+e6bf55d457016764b4dd785b61ae79a125ba869b jdk7u67-b32
+624c54795faaf1a92bc1eb8c369dc18c1704c812 jdk7u67-b33
+18077957a8b802d9ce8724856e8b5f3fcde38b9e jdk7u67-b34
 684f0285b699d304d1efff487b550ff2e1679e98 jdk7u66-b00
 a927daae851fa81d0470d2b67f52e8156e4d423c jdk7u66-b01
 6f229fda19bdabf7a3d1caad9d809dd713cce65d jdk7u66-b09
@@ -518,6 +546,55 @@
 cade57461d3b90a59ec62c06d77068b1b73f05b2 jdk7u72-b13
 6106b56a874e19e603660a09d506fe8afcde9e14 jdk7u72-b14
 7a09f7596c8bb17d3b25b4506dd76425f6efb15e jdk7u72-b30
+de0088aaf97fa861be8c17e97b57139287068c86 jdk7u72-b31
+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
 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
diff -r bcbd241df6cd -r 4c600e18a7e4 .jcheck/conf
--- a/.jcheck/conf	Tue Oct 07 12:59:24 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r bcbd241df6cd -r 4c600e18a7e4 make/Makefile
--- a/make/Makefile	Tue Oct 07 12:59:24 2014 -0700
+++ b/make/Makefile	Wed Feb 04 16:52:14 2015 +0000
@@ -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 bcbd241df6cd -r 4c600e18a7e4 make/build.properties
--- a/make/build.properties	Tue Oct 07 12:59:24 2014 -0700
+++ b/make/build.properties	Wed Feb 04 16:52:14 2015 +0000
@@ -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 bcbd241df6cd -r 4c600e18a7e4 make/build.xml
--- a/make/build.xml	Tue Oct 07 12:59:24 2014 -0700
+++ b/make/build.xml	Wed Feb 04 16:52:14 2015 +0000
@@ -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 bcbd241df6cd -r 4c600e18a7e4 src/share/classes/com/sun/tools/javac/comp/Check.java
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue Oct 07 12:59:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Wed Feb 04 16:52:14 2015 +0000
@@ -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 bcbd241df6cd -r 4c600e18a7e4 src/share/classes/com/sun/tools/javac/comp/TransTypes.java
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Tue Oct 07 12:59:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Wed Feb 04 16:52:14 2015 +0000
@@ -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 bcbd241df6cd -r 4c600e18a7e4 src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Tue Oct 07 12:59:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Wed Feb 04 16:52:14 2015 +0000
@@ -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
+                    }
                 }
             } finally {
                 log.useSource(prevSource);
diff -r bcbd241df6cd -r 4c600e18a7e4 src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Tue Oct 07 12:59:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Wed Feb 04 16:52:14 2015 +0000
@@ -1012,25 +1012,29 @@
 
         if (code.varBufferSize > 0) {
             int alenIdx = writeAttr(names.LocalVariableTable);
-            databuf.appendChar(code.varBufferSize);
+            databuf.appendChar(code.getLVTSize());
 
             for (int i=0; i<code.varBufferSize; i++) {
                 Code.LocalVar var = code.varBuffer[i];
-
-                // write variable info
-                Assert.check(var.start_pc >= 0
-                        && var.start_pc <= code.cp);
-                databuf.appendChar(var.start_pc);
-                Assert.check(var.length >= 0
-                        && (var.start_pc + var.length) <= code.cp);
-                databuf.appendChar(var.length);
-                VarSymbol sym = var.sym;
-                databuf.appendChar(pool.put(sym.name));
-                Type vartype = sym.erasure(types);
-                if (needsLocalVariableTypeEntry(sym.type))
-                    nGenericVars++;
-                databuf.appendChar(pool.put(typeSig(vartype)));
-                databuf.appendChar(var.reg);
+                for (Code.LocalVar.Range r: var.aliveRanges) {
+                    // write variable info
+                    if (!(r.start_pc >= 0 && r.start_pc <= code.cp)) {
+                        throw new AssertionError();
+                    }
+                    databuf.appendChar(r.start_pc);
+                    if (!(r.length >= 0 && (r.start_pc + r.length) <= code.cp)) {
+                        throw new AssertionError();
+                    }
+                    databuf.appendChar(r.length);
+                    VarSymbol sym = var.sym;
+                    databuf.appendChar(pool.put(sym.name));
+                    Type vartype = sym.erasure(types);
+                    databuf.appendChar(pool.put(typeSig(vartype)));
+                    databuf.appendChar(var.reg);
+                    if (needsLocalVariableTypeEntry(var.sym.type)) {
+                        nGenericVars++;
+                    }
+                }
             }
             endAttr(alenIdx);
             acount++;
@@ -1046,13 +1050,15 @@
                 VarSymbol sym = var.sym;
                 if (!needsLocalVariableTypeEntry(sym.type))
                     continue;
-                count++;
-                // write variable info
-                databuf.appendChar(var.start_pc);
-                databuf.appendChar(var.length);
-                databuf.appendChar(pool.put(sym.name));
-                databuf.appendChar(pool.put(typeSig(sym.type)));
-                databuf.appendChar(var.reg);
+                for (Code.LocalVar.Range r : var.aliveRanges) {
+                    // write variable info
+                    databuf.appendChar(r.start_pc);
+                    databuf.appendChar(r.length);
+                    databuf.appendChar(pool.put(sym.name));
+                    databuf.appendChar(pool.put(typeSig(sym.type)));
+                    databuf.appendChar(var.reg);
+                    count++;
+                }
             }
             Assert.check(count == nGenericVars);
             endAttr(alenIdx);
diff -r bcbd241df6cd -r 4c600e18a7e4 src/share/classes/com/sun/tools/javac/jvm/Code.java
--- a/src/share/classes/com/sun/tools/javac/jvm/Code.java	Tue Oct 07 12:59:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/Code.java	Wed Feb 04 16:52:14 2015 +0000
@@ -1151,7 +1151,9 @@
     public int entryPoint(State state) {
         int pc = curPc();
         alive = true;
-        this.state = state.dup();
+        State newState = state.dup();
+        setDefined(newState.defined);
+        this.state = newState;
         Assert.check(state.stacksize <= max_stack);
         if (debugCode) System.err.println("entry point " + state);
         pendingStackMap = needStackMap;
@@ -1164,7 +1166,9 @@
     public int entryPoint(State state, Type pushed) {
         int pc = curPc();
         alive = true;
-        this.state = state.dup();
+        State newState = state.dup();
+        setDefined(newState.defined);
+        this.state = newState;
         Assert.check(state.stacksize <= max_stack);
         this.state.push(pushed);
         if (debugCode) System.err.println("entry point " + state);
@@ -1452,6 +1456,10 @@
                 chain.pc + 3 == target && target == cp && !fixedPc) {
                 // If goto the next instruction, the jump is not needed:
                 // compact the code.
+                if (varDebugInfo) {
+                    adjustAliveRanges(cp, -3);
+                }
+
                 cp = cp - 3;
                 target = target - 3;
                 if (chain.next == null) {
@@ -1736,8 +1744,7 @@
                     sym = sym.clone(sym.owner);
                     sym.type = newtype;
                     LocalVar newlv = lvar[i] = new LocalVar(sym);
-                    // should the following be initialized to cp?
-                    newlv.start_pc = lv.start_pc;
+                    newlv.aliveRanges = lv.aliveRanges;
                 }
             }
         }
@@ -1825,18 +1832,118 @@
     static class LocalVar {
         final VarSymbol sym;
         final char reg;
-        char start_pc = Character.MAX_VALUE;
-        char length = Character.MAX_VALUE;
+
+        class Range {
+            char start_pc = Character.MAX_VALUE;
+            char length = Character.MAX_VALUE;
+
+            Range() {}
+
+            Range(char start) {
+                this.start_pc = start;
+            }
+
+            Range(char start, char length) {
+                this.start_pc = start;
+                this.length = length;
+            }
+
+            boolean closed() {
+                return start_pc != Character.MAX_VALUE && length != Character.MAX_VALUE;
+            }
+
+            @Override
+            public String toString() {
+                int currentStartPC = start_pc;
+                int currentLength = length;
+                return "startpc = " + currentStartPC + " length " + currentLength;
+            }
+        }
+
+        java.util.List<Range> aliveRanges = new java.util.ArrayList<Range>();
+
         LocalVar(VarSymbol v) {
             this.sym = v;
             this.reg = (char)v.adr;
         }
+
         public LocalVar dup() {
             return new LocalVar(sym);
         }
+


More information about the distro-pkg-dev mailing list