From 9b0970e1a92f51664588f960cbd755ac235f1da2 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 21 Sep 2015 15:47:18 +0300 Subject: [PATCH] Avoid calling KotlinBuiltIns.getInstance() in DescriptorRendererImpl --- .../jetbrains/kotlin/renderer/DescriptorRendererImpl.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index b26c5b38a16..05f9acc4121 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.descriptors.annotations.ANNOTATION_MODIFIERS_FQ_NAME import org.jetbrains.kotlin.descriptors.annotations.Annotated import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqNameBase import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -37,7 +36,7 @@ import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.ErrorUtils.UninferredParameterTypeConstructor import org.jetbrains.kotlin.types.TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass -import java.util.ArrayList +import java.util.* internal class DescriptorRendererImpl( val options: DescriptorRendererOptionsImpl @@ -502,14 +501,14 @@ internal class DescriptorRendererImpl( val upperBoundsCount = typeParameter.getUpperBounds().size() if ((upperBoundsCount > 1 && !topLevel) || upperBoundsCount == 1) { val upperBound = typeParameter.getUpperBounds().iterator().next() - if (KotlinBuiltIns.getInstance().getDefaultBound() != upperBound) { + if (!KotlinBuiltIns.isDefaultBound(upperBound)) { builder.append(" : ").append(renderType(upperBound)) } } else if (topLevel) { var first = true for (upperBound in typeParameter.getUpperBounds()) { - if (upperBound == KotlinBuiltIns.getInstance().getDefaultBound()) { + if (KotlinBuiltIns.isDefaultBound(upperBound)) { continue } if (first) { @@ -797,7 +796,7 @@ internal class DescriptorRendererImpl( private fun renderSuperTypes(klass: ClassDescriptor, builder: StringBuilder) { if (withoutSuperTypes) return - if (klass == KotlinBuiltIns.getInstance().getNothing()) return + if (KotlinBuiltIns.isNothing(klass.defaultType)) return val supertypes = klass.getTypeConstructor().getSupertypes() if (supertypes.isEmpty() || supertypes.size() == 1 && KotlinBuiltIns.isAnyOrNullableAny(supertypes.iterator().next())) return