Fix default type of static classes inside parametrized parents

Default type of LazySubstitutingClassDescriptor is not lazy. However, most of default types are,
and there is an optimization in KotlinTypeFactory, which uses default type for simple type without
type arguments and/or annotations. LazySubstitutingClassDescriptor's default type creates simple type
with factory, which may therefore cause recursion.

#KT-34029 Fixed
This commit is contained in:
Pavel Kirpichenkov
2019-10-24 11:04:16 +03:00
parent 905823fb1d
commit c21e699783
6 changed files with 46 additions and 1 deletions
@@ -141,7 +141,13 @@ public class LazySubstitutingClassDescriptor extends ModuleAwareClassDescriptor
@Override
public SimpleType getDefaultType() {
List<TypeProjection> typeProjections = TypeUtils.getDefaultTypeProjections(getTypeConstructor().getParameters());
return KotlinTypeFactory.simpleNotNullType(getAnnotations(), this, typeProjections);
return KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
getAnnotations(),
getTypeConstructor(),
typeProjections,
false,
getUnsubstitutedMemberScope()
);
}
@NotNull