From bce96baf20fda87ca8e0f5441a800c92f6f34c49 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 1 Jun 2016 11:23:23 +0300 Subject: [PATCH] KT-11588 Type aliases - Fix ISE in LazyDeclarationResolver --- .../kotlin/resolve/lazy/LazyDeclarationResolver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java index b6524c05cf7..8fe9a6a5fd1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java @@ -142,9 +142,9 @@ public class LazyDeclarationResolver { CallableDescriptor callableDescriptor = (CallableDescriptor) ownerDescriptor; typeParameters = callableDescriptor.getTypeParameters(); } - else if (ownerDescriptor instanceof ClassDescriptor) { - ClassDescriptor classDescriptor = (ClassDescriptor) ownerDescriptor; - typeParameters = classDescriptor.getTypeConstructor().getParameters(); + else if (ownerDescriptor instanceof ClassifierDescriptorWithTypeParameters) { + ClassifierDescriptorWithTypeParameters classifierDescriptor = (ClassifierDescriptorWithTypeParameters) ownerDescriptor; + typeParameters = classifierDescriptor.getTypeConstructor().getParameters(); } else { throw new IllegalStateException("Unknown owner kind for a type parameter: " + ownerDescriptor);