diff -r f4381f9541e6 -r 37c7dbe8efee src/share/classes/com/sun/tools/javac/code/Types.java --- a/src/share/classes/com/sun/tools/javac/code/Types.java Fri Jun 20 11:42:16 2014 -0600 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java Fri Jun 20 10:56:31 2014 -0600 @@ -2300,7 +2300,7 @@ public Type visitType(Type t, Void ignored) { // A note on wildcards: there is no good way to // determine a supertype for a super bounded wildcard. - return null; + return Type.noType; } @Override @@ -2467,7 +2467,7 @@ return false; return t.isRaw() || - supertype(t) != null && isDerivedRaw(supertype(t)) || + supertype(t) != Type.noType && isDerivedRaw(supertype(t)) || isDerivedRaw(interfaces(t)); }