diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index 217812a6b5a..f5d63e78780 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -38,8 +38,8 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget; import org.jetbrains.kotlin.jvm.RuntimeAssertionInfo; import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialJvmSignature; -import org.jetbrains.kotlin.load.java.BuiltinsPropertiesUtilKt; import org.jetbrains.kotlin.load.java.JvmAnnotationNames; +import org.jetbrains.kotlin.load.java.SpecialBuiltinMembers; import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeDeclarationsPackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetNamedFunction; @@ -517,7 +517,7 @@ public class FunctionCodegen { // If the function doesn't have a physical declaration among super-functions, it's a SAM adapter or alike and doesn't need bridges if (CallResolverUtilPackage.isOrOverridesSynthesized(descriptor)) return; - boolean isSpecial = BuiltinsPropertiesUtilKt.overridesBuiltinSpecialDeclaration(descriptor); + boolean isSpecial = SpecialBuiltinMembers.overridesBuiltinSpecialDeclaration(descriptor); Set> bridgesToGenerate; if (!isSpecial) { @@ -561,7 +561,7 @@ public class FunctionCodegen { } if (!descriptor.getKind().isReal() && isAbstractMethod(descriptor, OwnerKind.IMPLEMENTATION)) { - CallableDescriptor overridden = BuiltinsPropertiesUtilKt.getBuiltinSpecialOverridden(descriptor); + CallableDescriptor overridden = SpecialBuiltinMembers.getBuiltinSpecialOverridden(descriptor); assert overridden != null; Method method = typeMapper.mapSignature(descriptor).getAsmMethod(); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index 58bdc22b943..bd8288b2d20 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.fileClasses.FileClasses; import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil; import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider; import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialJvmSignature; -import org.jetbrains.kotlin.load.java.BuiltinsPropertiesUtilKt; +import org.jetbrains.kotlin.load.java.SpecialBuiltinMembers; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialJvmSignature.SpecialSignatureInfo; import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; @@ -732,7 +732,7 @@ public class JetTypeMapper { } FunctionDescriptor overriddenSpecialBuiltinFunction = - BuiltinsPropertiesUtilKt.getBuiltinSpecialOverridden(functionDescriptor.getOriginal()); + SpecialBuiltinMembers.getBuiltinSpecialOverridden(functionDescriptor.getOriginal()); FunctionDescriptor functionToCall = overriddenSpecialBuiltinFunction != null ? overriddenSpecialBuiltinFunction.getOriginal() : functionDescriptor.getOriginal(); @@ -815,7 +815,7 @@ public class JetTypeMapper { if (platformName != null) return platformName; } - String nameForSpecialFunction = BuiltinsPropertiesUtilKt.getJvmMethodNameIfSpecial(descriptor); + String nameForSpecialFunction = SpecialBuiltinMembers.getJvmMethodNameIfSpecial(descriptor); if (nameForSpecialFunction != null) return nameForSpecialFunction; if (descriptor instanceof PropertyAccessorDescriptor) { @@ -967,7 +967,7 @@ public class JetTypeMapper { FunctionDescriptor overridden = BuiltinMethodsWithSpecialJvmSignature.getOverriddenBuiltinFunctionWithErasedValueParametersInJava(f); if (overridden == null) return false; - if (BuiltinsPropertiesUtilKt.isFromJavaOrBuiltins(f)) return false; + if (SpecialBuiltinMembers.isFromJavaOrBuiltins(f)) return false; if (overridden.getName().asString().equals("remove") && mapType(parameter.getType()).getSort() == Type.INT) { writeParameter(sw, TypeUtils.makeNullable(parameter.getType())); diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/builtinsPropertiesUtil.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt similarity index 99% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/builtinsPropertiesUtil.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt index 521849e24b7..50466fad37c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/builtinsPropertiesUtil.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt @@ -14,6 +14,7 @@ * limitations under the License. */ +@file:JvmName("SpecialBuiltinMembers") package org.jetbrains.kotlin.load.java import org.jetbrains.kotlin.builtins.KotlinBuiltIns