Mercurial > hg > openjdk > jdk7 > langtools

changeset 729:20659c8c917d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6996415: Override bridges causes compiler-generated code to end up with synthetic infinite loop Summary: temporarily disable fix for override bridges (6337171) Reviewed-by: jjg
author mcimadamore
date Tue, 02 Nov 2010 12:00:54 +0000
parents 6ce6ee1b831a
children fadc6d3e63f4
files src/share/classes/com/sun/tools/javac/comp/TransTypes.java test/tools/javac/generics/OverrideBridge.java
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Mon Nov 01 19:28:40 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Tue Nov 02 12:00:54 2010 +0000
@@ -876,7 +876,8 @@
                 make.at(tree.pos);
                 if (addBridges) {
                     ListBuffer<JCTree> bridges = new ListBuffer<JCTree>();
-                    bridges.appendList(addOverrideBridgesIfNeeded(tree, c));
+                    if (false) //see CR: 6996415
+                        bridges.appendList(addOverrideBridgesIfNeeded(tree, c));
                     if ((tree.sym.flags() & INTERFACE) == 0)
                         addBridges(tree.pos(), tree.sym, bridges);
                     tree.defs = bridges.toList().prependList(tree.defs);
--- a/test/tools/javac/generics/OverrideBridge.java	Mon Nov 01 19:28:40 2010 -0700
+++ b/test/tools/javac/generics/OverrideBridge.java	Tue Nov 02 12:00:54 2010 +0000
@@ -23,7 +23,8 @@
 
 /*
  * @test
- * @bug 6337171
+ * @bug 6337171 6996415
+ * @ignore fix has been disabled as a consequence of 6996415
  * @summary  javac should create bridge methods when type variable bounds restricted
  * @run main OverrideBridge
  */