From 4a632857d7b2831d3965012cdf99be811e4ddfbc Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 1 Jun 2017 16:47:01 +0300 Subject: [PATCH] Fix internal compiler error in DefaultParameterValueSubstitutor Most likely a typo in the original code. --- .../kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt index d7e1fec728d..ac1615d04a4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt @@ -60,7 +60,7 @@ fun OtherOrigin(element: PsiElement?, descriptor: DeclarationDescriptor?): JvmDe else JvmDeclarationOrigin(OTHER, element, descriptor) fun OtherOrigin(element: KtPureElement?, descriptor: DeclarationDescriptor?): JvmDeclarationOrigin = - OtherOrigin(element?.psiOrParent as PsiElement, descriptor) + OtherOrigin(element?.psiOrParent as PsiElement?, descriptor) fun OtherOrigin(element: KtElement, descriptor: DeclarationDescriptor?): JvmDeclarationOrigin = OtherOrigin(element as PsiElement, descriptor)