Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Mon Nov 01 19:28:40 2010 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Tue Nov 02 12:00:54 2010 +0000
     1.3 @@ -876,7 +876,8 @@
     1.4                  make.at(tree.pos);
     1.5                  if (addBridges) {
     1.6                      ListBuffer<JCTree> bridges = new ListBuffer<JCTree>();
     1.7 -                    bridges.appendList(addOverrideBridgesIfNeeded(tree, c));
     1.8 +                    if (false) //see CR: 6996415
     1.9 +                        bridges.appendList(addOverrideBridgesIfNeeded(tree, c));
    1.10                      if ((tree.sym.flags() & INTERFACE) == 0)
    1.11                          addBridges(tree.pos(), tree.sym, bridges);
    1.12                      tree.defs = bridges.toList().prependList(tree.defs);

     2.1 --- a/test/tools/javac/generics/OverrideBridge.java	Mon Nov 01 19:28:40 2010 -0700
     2.2 +++ b/test/tools/javac/generics/OverrideBridge.java	Tue Nov 02 12:00:54 2010 +0000
     2.3 @@ -23,7 +23,8 @@
     2.4  
     2.5  /*
     2.6   * @test
     2.7 - * @bug 6337171
     2.8 + * @bug 6337171 6996415
     2.9 + * @ignore fix has been disabled as a consequence of 6996415
    2.10   * @summary  javac should create bridge methods when type variable bounds restricted
    2.11   * @run main OverrideBridge
    2.12   */