From 44dffa7bbc610cd8ee65bc5b69a9b43efddfe291 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 29 Jun 2015 19:26:20 +0300 Subject: [PATCH] Minor: remove a couple of usages of KotlinBuiltIns.getInstance() --- .../codegen/CollectionStubMethodGenerator.kt | 30 ++++++++++--------- .../codegen/binding/CodegenBinding.java | 5 ++-- .../lazy/descriptors/LazyJavaMemberScope.kt | 5 ++-- .../impl/AbstractTypeParameterDescriptor.java | 7 +++-- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index 4b466be340e..542ea8cdd9c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -18,23 +18,25 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.* -import org.jetbrains.kotlin.descriptors.impl.* -import org.jetbrains.org.objectweb.asm.Opcodes.* -import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin -import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter -import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.types.* -import org.jetbrains.kotlin.resolve.scopes.JetScope +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.OverrideResolver import org.jetbrains.kotlin.resolve.OverridingUtil -import java.util.LinkedHashSet -import org.jetbrains.kotlin.name.Name -import java.util.ArrayList -import org.jetbrains.kotlin.types.checker.JetTypeChecker -import java.util.HashSet +import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature +import org.jetbrains.kotlin.resolve.scopes.JetScope +import org.jetbrains.kotlin.types.* +import org.jetbrains.kotlin.types.checker.JetTypeChecker +import org.jetbrains.org.objectweb.asm.Opcodes.ACC_ABSTRACT +import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PUBLIC +import org.jetbrains.org.objectweb.asm.Opcodes.ACC_SYNTHETIC +import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter +import java.util.ArrayList +import java.util.HashSet +import java.util.LinkedHashSet /** * Generates exception-throwing stubs for methods from mutable collection classes not implemented in Kotlin classes which inherit only from @@ -127,7 +129,7 @@ class CollectionStubMethodGenerator( private fun findRelevantSuperCollectionClasses(): Collection { fun pair(readOnlyClass: ClassDescriptor, mutableClass: ClassDescriptor) = CollectionClassPair(readOnlyClass, mutableClass) - val collectionClasses = with(KotlinBuiltIns.getInstance()) { + val collectionClasses = with(descriptor.builtIns) { listOf( pair(getCollection(), getMutableCollection()), pair(getSet(), getMutableSet()), diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java index bfbcb51e979..ebac3428ae2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.codegen.binding; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.JvmCodegenUtil; import org.jetbrains.kotlin.codegen.SamType; import org.jetbrains.kotlin.codegen.state.GenerationState; @@ -32,6 +31,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.util.slicedMap.BasicWritableSlice; import org.jetbrains.kotlin.util.slicedMap.Slices; @@ -207,7 +207,8 @@ public class CodegenBinding { String simpleName = asmType.getInternalName().substring(asmType.getInternalName().lastIndexOf('/') + 1); ClassDescriptorImpl classDescriptor = new ClassDescriptorImpl(descriptor, Name.special(""), Modality.FINAL, - Collections.singleton(KotlinBuiltIns.getInstance().getAnyType()), toSourceElement(script)); + Collections.singleton(DescriptorUtilPackage.getBuiltIns(descriptor).getAnyType()), + toSourceElement(script)); classDescriptor.initialize(JetScope.Empty.INSTANCE$, Collections.emptySet(), null); recordClosure(trace, classDescriptor, null, asmType); diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt index 30b7914a38a..93e435d526c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.load.java.lazy.descriptors -import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl @@ -180,7 +179,7 @@ public abstract class LazyJavaMemberScope( val paramType = javaParameter.getType() as? JavaArrayType ?: throw AssertionError("Vararg parameter should be an array: $javaParameter") val outType = c.typeResolver.transformArrayType(paramType, typeUsage, true) - outType to KotlinBuiltIns.getInstance().getArrayElementType(outType) + outType to c.module.builtIns.getArrayElementType(outType) } else { c.typeResolver.transformJavaType(javaParameter.getType(), typeUsage) to null @@ -188,7 +187,7 @@ public abstract class LazyJavaMemberScope( val name = if (function.getName().asString() == "equals" && jValueParameters.size() == 1 && - KotlinBuiltIns.getInstance().getNullableAnyType() == outType) { + c.module.builtIns.getNullableAnyType() == outType) { // This is a hack to prevent numerous warnings on Kotlin classes that inherit Java classes: if you override "equals" in such // class without this hack, you'll be warned that in the superclass the name is "p0" (regardless of the fact that it's // "other" in Any) diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java index 0726e92893f..6a094e436d2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.descriptors.impl; import kotlin.jvm.functions.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptorVisitor; import org.jetbrains.kotlin.descriptors.SourceElement; @@ -36,6 +35,8 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.Collections; import java.util.Set; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; + public abstract class AbstractTypeParameterDescriptor extends DeclarationDescriptorNonRootImpl implements TypeParameterDescriptor { private final Variance variance; private final boolean reified; @@ -135,7 +136,7 @@ public abstract class AbstractTypeParameterDescriptor extends DeclarationDescrip Set upperBounds = getUpperBounds(); assert !upperBounds.isEmpty() : "Upper bound list is empty in " + getName(); JetType upperBoundsAsType = TypeUtils.intersect(JetTypeChecker.DEFAULT, upperBounds); - return upperBoundsAsType != null ? upperBoundsAsType : KotlinBuiltIns.getInstance().getNothingType(); + return upperBoundsAsType != null ? upperBoundsAsType : getBuiltIns(this).getNothingType(); } @NotNull @@ -153,7 +154,7 @@ public abstract class AbstractTypeParameterDescriptor extends DeclarationDescrip @NotNull @Override public Set getLowerBounds() { - return Collections.singleton(KotlinBuiltIns.getInstance().getNothingType()); + return Collections.singleton(getBuiltIns(this).getNothingType()); } @NotNull