Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/code/Types.java	Fri May 30 10:29:27 2008 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Fri May 30 10:42:43 2008 +0100
     1.3 @@ -301,7 +301,11 @@
     1.4                  : isSubtypeUnchecked(elemtype(t), elemtype(s), warn);
     1.5          } else if (isSubtype(t, s)) {
     1.6              return true;
     1.7 -        } else if (!s.isRaw()) {
     1.8 +        }
     1.9 +        else if (t.tag == TYPEVAR) {
    1.10 +            return isSubtypeUnchecked(t.getUpperBound(), s, warn);
    1.11 +        }
    1.12 +        else if (!s.isRaw()) {
    1.13              Type t2 = asSuper(t, s.tsym);
    1.14              if (t2 != null && t2.isRaw()) {
    1.15                  if (isReifiable(s))