Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Lower.java	Sat Sep 18 14:24:09 2010 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java	Wed Sep 22 20:53:34 2010 +0530
     1.3 @@ -2679,7 +2679,8 @@
     1.4      }
     1.5  //where
     1.6          private JCTree convert(JCTree tree, Type pt) {
     1.7 -            if (tree.type == pt) return tree;
     1.8 +            if (tree.type == pt || tree.type.tag == TypeTags.BOT)
     1.9 +                return tree;
    1.10              JCTree result = make_at(tree.pos()).TypeCast(make.Type(pt), (JCExpression)tree);
    1.11              result.type = (tree.type.constValue() != null) ? cfolder.coerce(tree.type, pt)
    1.12                                                             : pt;

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/tools/javac/T6587674.java	Wed Sep 22 20:53:34 2010 +0530
     2.3 @@ -0,0 +1,39 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/*
    2.28 + * @test
    2.29 + * @bug 6587674
    2.30 + * @summary NoClassdefFound when anonymously extending a class.
    2.31 + */
    2.32 +
    2.33 +import java.util.Vector;
    2.34 +
    2.35 +public class T6587674 {
    2.36 +    private static final Vector<String> list =
    2.37 +        true ? null : new Vector<String>() { };
    2.38 +
    2.39 +    public static void main(String[] args) {
    2.40 +        System.out.println("T6587674 runs fine!");
    2.41 +    }
    2.42 +}