langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
changeset 24293 0d889f759fac
parent 24226 08b586e22328
child 24396 3c36c6afcbca
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java	Fri May 02 16:41:10 2014 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue May 06 15:46:09 2014 -0600
@@ -626,7 +626,7 @@
          } else if (a.isExtendsBound()) {
              return types.isCastable(bound, types.upperBound(a), types.noWarnings);
          } else if (a.isSuperBound()) {
-             return !types.notSoftSubtype(types.lowerBound(a), bound);
+             return !types.notSoftSubtype(types.wildLowerBound(a), bound);
          }
          return true;
      }
@@ -2730,7 +2730,7 @@
         if (types.isSameType(type, syms.stringType)) return;
         if ((type.tsym.flags() & Flags.ENUM) != 0) return;
         if ((type.tsym.flags() & Flags.ANNOTATION) != 0) return;
-        if (types.lowerBound(type).tsym == syms.classType.tsym) return;
+        if (types.cvarLowerBound(type).tsym == syms.classType.tsym) return;
         if (types.isArray(type) && !types.isArray(types.elemtype(type))) {
             validateAnnotationType(pos, types.elemtype(type));
             return;