1.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java Fri Jun 20 11:42:16 2014 -0600 1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java Fri Jun 20 10:56:31 2014 -0600 1.3 @@ -2300,7 +2300,7 @@ 1.4 public Type visitType(Type t, Void ignored) { 1.5 // A note on wildcards: there is no good way to 1.6 // determine a supertype for a super bounded wildcard. 1.7 - return null; 1.8 + return Type.noType; 1.9 } 1.10 1.11 @Override 1.12 @@ -2467,7 +2467,7 @@ 1.13 return false; 1.14 return 1.15 t.isRaw() || 1.16 - supertype(t) != null && isDerivedRaw(supertype(t)) || 1.17 + supertype(t) != Type.noType && isDerivedRaw(supertype(t)) || 1.18 isDerivedRaw(interfaces(t)); 1.19 } 1.20