Mercurial > jdk8-mips64-public > langtools / file comparison
comparison: src/share/classes/com/sun/tools/javac/code/Types.java
src/share/classes/com/sun/tools/javac/code/Types.java
- changeset 2544
- 91e9834baff2
- parent 2543
- c6d5efccedc3
- child 2545
- 64dc6333e6dc
equal
deleted
inserted
replaced
| 2543:c6d5efccedc3 | 2544:91e9834baff2 |
|---|---|
| 1394 if (s.isPartial()) | 1394 if (s.isPartial()) |
| 1395 return containedBy(s, t); | 1395 return containedBy(s, t); |
| 1396 else { | 1396 else { |
| 1397 // debugContainsType(t, s); | 1397 // debugContainsType(t, s); |
| 1398 return isSameWildcard(t, s) | 1398 return isSameWildcard(t, s) |
| 1399 || t.type == s | |
| 1399 || isCaptureOf(s, t) | 1400 || isCaptureOf(s, t) |
| 1400 || ((t.isExtendsBound() || isSubtypeNoCapture(wildLowerBound(t), cvarLowerBound(wildLowerBound(s)))) && | 1401 || ((t.isExtendsBound() || isSubtypeNoCapture(wildLowerBound(t), cvarLowerBound(wildLowerBound(s)))) && |
| 1401 // TODO: JDK-8039214, cvarUpperBound call here is incorrect | 1402 // TODO: JDK-8039214, cvarUpperBound call here is incorrect |
| 1402 (t.isSuperBound() || isSubtypeNoCapture(cvarUpperBound(wildUpperBound(s)), wildUpperBound(t)))); | 1403 (t.isSuperBound() || isSubtypeNoCapture(cvarUpperBound(wildUpperBound(s)), wildUpperBound(t)))); |
| 1403 } | 1404 } |
