OpenJDK / bsd-port / jdk8 / langtools
changeset 342:dd5c51734ad9
6864382: NPE in the rich formatter when processing an unattributed type-variable
Summary: Unattributed type variable should not be accessed by the rich formatter when emitting where clauses
Reviewed-by: jjg
| author | mcimadamore |
|---|---|
| date | Thu, 30 Jul 2009 10:30:24 +0100 |
| parents | b1e027181dd4 |
| children | 6d0add6ad778 |
| files | src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java test/tools/javac/Diagnostics/6864382/T6864382.java test/tools/javac/Diagnostics/6864382/T6864382.out |
| diffstat | 3 files changed, 41 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Thu Jul 30 10:30:10 2009 +0100 +++ b/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Thu Jul 30 10:30:24 2009 +0100 @@ -524,10 +524,16 @@ @Override public Void visitTypeVar(TypeVar t, Void ignored) { if (indexOf(t, WhereClauseKind.TYPEVAR) == -1) { + //access the bound type and skip error types Type bound = t.bound; while ((bound instanceof ErrorType)) bound = ((ErrorType)bound).getOriginalType(); - List<Type> bounds = types.getBounds(t); + //retrieve the bound list - if the type variable + //has not been attributed the bound is not set + List<Type> bounds = bound != null ? + types.getBounds(t) : + List.<Type>nil(); + nameSimplifier.addUsage(t.tsym); boolean boundErroneous = bounds.head == null ||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/Diagnostics/6864382/T6864382.java Thu Jul 30 10:30:24 2009 +0100 @@ -0,0 +1,32 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/** + * @test + * @bug 6864382 + * @summary NullPointerException when compiling a negative java source + * @author mcimadamore + * @compile/fail/ref=T6864382.out -XDrawDiagnostics T6864382.java + */ + +class T6864382<T> extends T {}