From 7802492b08c594ab3fb6b8e88dadab1674edcdcd Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Wed, 14 Jun 2017 14:21:50 +0300 Subject: [PATCH] [NI] Fix resulting type when there are no proper constraints --- .../resolve/calls/inference/components/ResultTypeResolver.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ResultTypeResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ResultTypeResolver.kt index f8117c72346..f51e0719cdd 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ResultTypeResolver.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ResultTypeResolver.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ class ResultTypeResolver( // no proper constraints return variableWithConstraints.typeVariable.freshTypeConstructor.builtIns.run { - if (direction == ResolveDirection.TO_SUBTYPE) nothingType else anyType + if (direction == ResolveDirection.TO_SUBTYPE) nothingType else nullableAnyType } }