From 87659bd95b58b092d5b3c0abee71815aade2211b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 23 Jun 2015 19:37:48 +0300 Subject: [PATCH] JS/RTTI: fix nullability check --- .../kotlin/js/translate/expression/PatternTranslator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java index 6e9f8d8da4b..663430e39db 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java @@ -105,7 +105,7 @@ public final class PatternTranslator extends AbstractTranslator { @NotNull public JsExpression translateIsCheck(@NotNull JsExpression subject, @NotNull KtTypeReference typeReference) { KotlinType type = BindingUtils.getTypeByReference(bindingContext(), typeReference); - JsExpression checkFunReference = getIsTypeCheckCallable(type); + JsExpression checkFunReference = doGetIsTypeCheckCallable(type); if (isReifiedTypeParameter(type) && findChildByType(typeReference, KtNodeTypes.NULLABLE_TYPE) != null) { checkFunReference = namer().orNull(checkFunReference); @@ -118,7 +118,7 @@ public final class PatternTranslator extends AbstractTranslator { public JsExpression getIsTypeCheckCallable(@NotNull KotlinType type) { JsExpression callable = doGetIsTypeCheckCallable(type); - if (isNullableType(type) && !isReifiedTypeParameter(type)) { + if (isNullableType(type)) { return namer().orNull(callable); }