Skip to content

Commit 90e076b

Browse files
committed
8357654: [BACKOUT] JDK-8343580: Type error with inner classes of generic classes in functions generic by outer
Reviewed-by: mcimadamore, liach, vromero
1 parent 6a07820 commit 90e076b

File tree

2 files changed

+1
-67
lines changed

2 files changed

+1
-67
lines changed

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,11 +1155,7 @@ public void setEnclosingType(Type outer) {
11551155

11561156
public List<Type> allparams() {
11571157
if (allparams_field == null) {
1158-
Type enclosingType = getEnclosingType();
1159-
while (enclosingType.hasTag(TYPEVAR)) {
1160-
enclosingType = enclosingType.getUpperBound();
1161-
}
1162-
allparams_field = getTypeArguments().prependList(enclosingType.allparams());
1158+
allparams_field = getTypeArguments().prependList(getEnclosingType().allparams());
11631159
}
11641160
return allparams_field;
11651161
}

test/langtools/tools/javac/T8343580.java

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)