diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java index e9fad485888..507aeca123a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.annotation.WrappedAnnotated; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.*; import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; @@ -67,9 +67,9 @@ public abstract class AnnotationCodegen { private static final AnnotationVisitor NO_ANNOTATION_VISITOR = new AnnotationVisitor(Opcodes.ASM5) {}; - private final JetTypeMapper typeMapper; + private final KotlinTypeMapper typeMapper; - private AnnotationCodegen(JetTypeMapper mapper) { + private AnnotationCodegen(KotlinTypeMapper mapper) { typeMapper = mapper; } @@ -160,7 +160,7 @@ public abstract class AnnotationCodegen { } private static boolean isInvisibleFromTheOutside(@Nullable DeclarationDescriptor descriptor) { - if (descriptor instanceof CallableMemberDescriptor && JetTypeMapper.isAccessor((CallableMemberDescriptor) descriptor)) return false; + if (descriptor instanceof CallableMemberDescriptor && KotlinTypeMapper.isAccessor((CallableMemberDescriptor) descriptor)) return false; if (descriptor instanceof MemberDescriptor) { return AsmUtil.getVisibilityAccessFlag((MemberDescriptor) descriptor) == Opcodes.ACC_PRIVATE; } @@ -480,7 +480,7 @@ public abstract class AnnotationCodegen { @NotNull abstract AnnotationVisitor visitAnnotation(String descr, boolean visible); - public static AnnotationCodegen forClass(final ClassVisitor cv, JetTypeMapper mapper) { + public static AnnotationCodegen forClass(final ClassVisitor cv, KotlinTypeMapper mapper) { return new AnnotationCodegen(mapper) { @NotNull @Override @@ -490,7 +490,7 @@ public abstract class AnnotationCodegen { }; } - public static AnnotationCodegen forMethod(final MethodVisitor mv, JetTypeMapper mapper) { + public static AnnotationCodegen forMethod(final MethodVisitor mv, KotlinTypeMapper mapper) { return new AnnotationCodegen(mapper) { @NotNull @Override @@ -500,7 +500,7 @@ public abstract class AnnotationCodegen { }; } - public static AnnotationCodegen forField(final FieldVisitor fv, JetTypeMapper mapper) { + public static AnnotationCodegen forField(final FieldVisitor fv, KotlinTypeMapper mapper) { return new AnnotationCodegen(mapper) { @NotNull @Override @@ -510,7 +510,7 @@ public abstract class AnnotationCodegen { }; } - public static AnnotationCodegen forParameter(final int parameter, final MethodVisitor mv, JetTypeMapper mapper) { + public static AnnotationCodegen forParameter(final int parameter, final MethodVisitor mv, KotlinTypeMapper mapper) { return new AnnotationCodegen(mapper) { @NotNull @Override @@ -520,7 +520,7 @@ public abstract class AnnotationCodegen { }; } - public static AnnotationCodegen forAnnotationDefaultValue(final MethodVisitor mv, JetTypeMapper mapper) { + public static AnnotationCodegen forAnnotationDefaultValue(final MethodVisitor mv, KotlinTypeMapper mapper) { return new AnnotationCodegen(mapper) { @NotNull @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 0874094a5a1..32eaf17cc66 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.serialization.JvmStringTable; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.jvm.RuntimeAssertionInfo; import org.jetbrains.kotlin.lexer.KtTokens; @@ -171,7 +171,7 @@ public class AsmUtil { public static boolean isStaticMethod(OwnerKind kind, CallableMemberDescriptor functionDescriptor) { return isStaticKind(kind) || - JetTypeMapper.isStaticAccessor(functionDescriptor) || + KotlinTypeMapper.isStaticAccessor(functionDescriptor) || AnnotationUtilKt.isPlatformStaticInObjectOrClass(functionDescriptor); } @@ -213,7 +213,7 @@ public class AsmUtil { flags |= ACC_ABSTRACT; } - if (JetTypeMapper.isAccessor(functionDescriptor) + if (KotlinTypeMapper.isAccessor(functionDescriptor) || AnnotationUtilKt.hasJvmSyntheticAnnotation(functionDescriptor)) { flags |= ACC_SYNTHETIC; } @@ -418,7 +418,7 @@ public class AsmUtil { v.athrow(); } - public static void genClosureFields(CalculatedClosure closure, ClassBuilder v, JetTypeMapper typeMapper) { + public static void genClosureFields(CalculatedClosure closure, ClassBuilder v, KotlinTypeMapper typeMapper) { List> allFields = new ArrayList>(); ClassifierDescriptor captureThis = closure.getCaptureThis(); @@ -619,7 +619,7 @@ public class AsmUtil { private static void genParamAssertion( @NotNull InstructionAdapter v, - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @NotNull FrameMap frameMap, @NotNull CallableDescriptor parameter, @NotNull String name diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 293ff771fa4..1098da975bb 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.codegen.serialization.JvmSerializerExtension; import org.jetbrains.kotlin.codegen.signature.JvmSignatureWriter; import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; @@ -405,7 +405,7 @@ public class ClosureCodegen extends MemberCodegen { @NotNull public static List calculateConstructorParameters( - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @NotNull CalculatedClosure closure, @NotNull Type ownerType ) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 5d14fb99484..79654e3e4ed 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.codegen.pseudoInsns.PseudoInsnsKt; import org.jetbrains.kotlin.codegen.signature.JvmSignatureWriter; import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.codegen.when.SwitchCodegen; import org.jetbrains.kotlin.codegen.when.SwitchCodegenUtil; import org.jetbrains.kotlin.descriptors.*; @@ -111,7 +111,7 @@ import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class ExpressionCodegen extends KtVisitor implements LocalLookup { private final GenerationState state; - final JetTypeMapper typeMapper; + final KotlinTypeMapper typeMapper; private final BindingContext bindingContext; public final InstructionAdapter v; @@ -2254,7 +2254,7 @@ public class ExpressionCodegen extends KtVisitor impleme fieldName = ((FieldOwnerContext) backingFieldContext).getFieldName(propertyDescriptor, isDelegatedProperty); } else { - fieldName = JetTypeMapper.mapDefaultFieldName(propertyDescriptor, isDelegatedProperty); + fieldName = KotlinTypeMapper.mapDefaultFieldName(propertyDescriptor, isDelegatedProperty); } return StackValue.property(propertyDescriptor, backingFieldOwner, @@ -2839,12 +2839,12 @@ public class ExpressionCodegen extends KtVisitor impleme } @NotNull - public static StackValue generateClassLiteralReference(@NotNull JetTypeMapper typeMapper, @NotNull KotlinType type) { + public static StackValue generateClassLiteralReference(@NotNull KotlinTypeMapper typeMapper, @NotNull KotlinType type) { return generateClassLiteralReference(typeMapper, type, null); } @NotNull - private static StackValue generateClassLiteralReference(@NotNull final JetTypeMapper typeMapper, @NotNull final KotlinType type, @Nullable final ExpressionCodegen codegen) { + private static StackValue generateClassLiteralReference(@NotNull final KotlinTypeMapper typeMapper, @NotNull final KotlinType type, @Nullable final ExpressionCodegen codegen) { return StackValue.operation(K_CLASS_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter v) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java index 76823ba4da5..53cbdee60d1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.CompanionObjectMapping; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.resolve.DescriptorUtils; @@ -32,7 +32,7 @@ public class FieldInfo { private static final CompanionObjectMapping COMPANION_OBJECT_MAPPING = new CompanionObjectMapping(JvmPlatform.INSTANCE.getBuiltIns()); @NotNull - public static FieldInfo createForSingleton(@NotNull ClassDescriptor classDescriptor, @NotNull JetTypeMapper typeMapper) { + public static FieldInfo createForSingleton(@NotNull ClassDescriptor classDescriptor, @NotNull KotlinTypeMapper typeMapper) { if (!classDescriptor.getKind().isSingleton() || DescriptorUtils.isEnumEntry(classDescriptor)) { throw new UnsupportedOperationException("Can't create singleton field for class: " + classDescriptor); } @@ -51,7 +51,7 @@ public class FieldInfo { @NotNull public static FieldInfo createSingletonViaInstance( @NotNull ClassDescriptor classDescriptor, - @NotNull JetTypeMapper typeMapper + @NotNull KotlinTypeMapper typeMapper ) { Type type = typeMapper.mapType(classDescriptor); return new FieldInfo(type, type, JvmAbi.INSTANCE_FIELD, true); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index 0d7494910cf..09a62b533a2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.codegen.annotation.AnnotatedWithOnlyTargetedAnnotati import org.jetbrains.kotlin.codegen.context.*; import org.jetbrains.kotlin.codegen.optimization.OptimizationMethodVisitor; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotated; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; @@ -86,7 +86,7 @@ import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class FunctionCodegen { public final GenerationState state; - private final JetTypeMapper typeMapper; + private final KotlinTypeMapper typeMapper; private final BindingContext bindingContext; private final CodegenContext owner; private final ClassBuilder v; @@ -301,7 +301,7 @@ public class FunctionCodegen { private static Type getThisTypeForFunction( @NotNull FunctionDescriptor functionDescriptor, @NotNull MethodContext context, - @NotNull JetTypeMapper typeMapper + @NotNull KotlinTypeMapper typeMapper ) { ReceiverParameterDescriptor dispatchReceiver = functionDescriptor.getDispatchReceiverParameter(); if (functionDescriptor instanceof ConstructorDescriptor) { @@ -333,7 +333,7 @@ public class FunctionCodegen { Label methodBegin = new Label(); mv.visitLabel(methodBegin); - JetTypeMapper typeMapper = parentCodegen.typeMapper; + KotlinTypeMapper typeMapper = parentCodegen.typeMapper; if (BuiltinSpecialBridgesUtil.shouldHaveTypeSafeBarrier(functionDescriptor, getSignatureMapper(typeMapper))) { generateTypeCheckBarrierIfNeeded( new InstructionAdapter(mv), functionDescriptor, signature.getReturnType(), /* delegateParameterType = */null); @@ -363,7 +363,7 @@ public class FunctionCodegen { mv.visitLabel(methodEntry); context.setMethodStartLabel(methodEntry); - if (!JetTypeMapper.isAccessor(functionDescriptor)) { + if (!KotlinTypeMapper.isAccessor(functionDescriptor)) { genNotNullAssertionsForParameters(new InstructionAdapter(mv), parentCodegen.state, functionDescriptor, frameMap); } methodEnd = new Label(); @@ -591,7 +591,7 @@ public class FunctionCodegen { } @NotNull - private static Function1 getSignatureMapper(final @NotNull JetTypeMapper typeMapper) { + private static Function1 getSignatureMapper(final @NotNull KotlinTypeMapper typeMapper) { return new Function1() { @Override public Method invoke(FunctionDescriptor descriptor) { @@ -613,7 +613,7 @@ public class FunctionCodegen { } @NotNull - public static String[] getThrownExceptions(@NotNull FunctionDescriptor function, @NotNull final JetTypeMapper mapper) { + public static String[] getThrownExceptions(@NotNull FunctionDescriptor function, @NotNull final KotlinTypeMapper mapper) { AnnotationDescriptor annotation = function.getAnnotations().findAnnotation(new FqName("kotlin.throws")); if (annotation == null) { annotation = function.getAnnotations().findAnnotation(new FqName("kotlin.jvm.Throws")); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index a2577ad4e1a..46b05c47904 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.context.FacadePartWithSourceFile; import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.context.RootContext; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.load.java.descriptors.JavaPropertyDescriptor; import org.jetbrains.kotlin.load.kotlin.ModuleMapping; @@ -138,7 +138,7 @@ public class JvmCodegenUtil { boolean isDelegated, @NotNull MethodContext contextBeforeInline ) { - if (JetTypeMapper.isAccessor(property)) return false; + if (KotlinTypeMapper.isAccessor(property)) return false; CodegenContext context = contextBeforeInline.getFirstCrossInlineOrNonInlineContext(); // Inline functions can't use direct access because a field may not be visible at the call site diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index f0f99b9ac6f..6750893a7fa 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.backend.common.CodegenUtil; import org.jetbrains.kotlin.codegen.context.*; import org.jetbrains.kotlin.codegen.inline.*; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; @@ -74,7 +74,7 @@ public abstract class MemberCodegen parentCodegen; @@ -672,7 +672,7 @@ public abstract class MemberCodegen memberCodegen; @@ -488,7 +488,7 @@ public class PropertyCodegen { public static StackValue invokeDelegatedPropertyConventionMethod( @NotNull PropertyDescriptor propertyDescriptor, @NotNull ExpressionCodegen codegen, - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @NotNull ResolvedCall resolvedCall, final int indexInPropertyMetadataArray, int propertyMetadataArgumentIndex diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java index de8566334f0..5d193662fc6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; @@ -49,7 +49,7 @@ public class SamWrapperCodegen { private static final String FUNCTION_FIELD_NAME = "function"; private final GenerationState state; - private final JetTypeMapper typeMapper; + private final KotlinTypeMapper typeMapper; private final SamType samType; private final MemberCodegen parentCodegen; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index a3650948b3c..6929b06f006 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.intrinsics.JavaClassProperty; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor; import org.jetbrains.kotlin.load.java.JvmAbi; @@ -590,7 +590,7 @@ public abstract class StackValue { } @NotNull - public static Field enumEntry(@NotNull ClassDescriptor descriptor, @NotNull JetTypeMapper typeMapper) { + public static Field enumEntry(@NotNull ClassDescriptor descriptor, @NotNull KotlinTypeMapper typeMapper) { DeclarationDescriptor enumClass = descriptor.getContainingDeclaration(); assert DescriptorUtils.isEnumClass(enumClass) : "Enum entry should be declared in enum class: " + descriptor; Type type = typeMapper.mapType((ClassDescriptor) enumClass); @@ -598,11 +598,11 @@ public abstract class StackValue { } @NotNull - public static Field singleton(@NotNull ClassDescriptor classDescriptor, @NotNull JetTypeMapper typeMapper) { + public static Field singleton(@NotNull ClassDescriptor classDescriptor, @NotNull KotlinTypeMapper typeMapper) { return field(FieldInfo.createForSingleton(classDescriptor, typeMapper), none()); } - public static Field singletonViaInstance(ClassDescriptor classDescriptor, JetTypeMapper typeMapper) { + public static Field singletonViaInstance(ClassDescriptor classDescriptor, KotlinTypeMapper typeMapper) { return field(FieldInfo.createSingletonViaInstance(classDescriptor, typeMapper), none()); } @@ -980,7 +980,7 @@ public abstract class StackValue { } } - public static boolean isStandardStack(@NotNull JetTypeMapper typeMapper, @Nullable ResolvedCall call, int valueParamsSize) { + public static boolean isStandardStack(@NotNull KotlinTypeMapper typeMapper, @Nullable ResolvedCall call, int valueParamsSize) { if (call == null) { return true; } @@ -1408,7 +1408,7 @@ public abstract class StackValue { @NotNull ResolvedCall resolvedCall, @Nullable ReceiverParameterDescriptor dispatchReceiver, @Nullable ReceiverParameterDescriptor extensionReceiver, - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @Nullable Callable callableMethod, @NotNull GenerationState state ) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java index 5478da4744c..98e6d607b2c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.codegen.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.ClassDescriptor; public class AnonymousClassContext extends ClassContext { public AnonymousClassContext( - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @NotNull ClassDescriptor contextDescriptor, @NotNull OwnerKind contextKind, @Nullable CodegenContext parentContext, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java index 050a2b4da9b..c99e7b9e7a4 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import static org.jetbrains.kotlin.codegen.AsmUtil.CAPTURED_THIS_FIELD; @@ -28,10 +28,10 @@ import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLOSURE; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.canHaveOuter; public class ClassContext extends FieldOwnerContext { - private final JetTypeMapper typeMapper; + private final KotlinTypeMapper typeMapper; public ClassContext( - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @NotNull ClassDescriptor contextDescriptor, @NotNull OwnerKind contextKind, @Nullable CodegenContext parentContext, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java index e51bc7ced13..a15b6ecc4e7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.anonymousClassForCallable; @@ -28,7 +28,7 @@ public class ClosureContext extends ClassContext { private final FunctionDescriptor functionDescriptor; public ClosureContext( - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @NotNull FunctionDescriptor functionDescriptor, @Nullable CodegenContext parentContext, @NotNull LocalLookup localLookup diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java index c1f846b738e..3361ed51f4a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.load.java.JavaVisibilities; import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor; @@ -317,7 +317,7 @@ public abstract class CodegenContext { @NotNull ScriptDescriptor script, @NotNull List earlierScripts, @NotNull ClassDescriptor classDescriptor, - @NotNull JetTypeMapper typeMapper + @NotNull KotlinTypeMapper typeMapper ) { return new ScriptContext(typeMapper, script, earlierScripts, classDescriptor, this); } @@ -326,7 +326,7 @@ public abstract class CodegenContext { public ClosureContext intoClosure( @NotNull FunctionDescriptor funDescriptor, @NotNull LocalLookup localLookup, - @NotNull JetTypeMapper typeMapper + @NotNull KotlinTypeMapper typeMapper ) { return new ClosureContext(typeMapper, funDescriptor, this, localLookup); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/DefaultImplsClassContext.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/DefaultImplsClassContext.kt index ad1a44235d7..a395941ca14 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/DefaultImplsClassContext.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/DefaultImplsClassContext.kt @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.codegen.context import org.jetbrains.kotlin.codegen.AccessorForCallableDescriptor import org.jetbrains.kotlin.codegen.OwnerKind -import org.jetbrains.kotlin.codegen.state.JetTypeMapper +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor class DefaultImplsClassContext( - typeMapper: JetTypeMapper, + typeMapper: KotlinTypeMapper, contextDescriptor: ClassDescriptor, contextKind: OwnerKind, parentContext: CodegenContext<*>?, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java index 6ed46378719..96ae369c60a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AccessorForPropertyDescriptor; import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.binding.MutableClosure; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; @@ -54,7 +54,7 @@ public abstract class FieldOwnerContext extends PropertyDescriptor descriptor = possiblySubstitutedDescriptor.getOriginal(); assert descriptor.getKind().isReal() : "Only declared properties can have backing fields: " + descriptor; - String defaultPropertyName = JetTypeMapper.mapDefaultFieldName(descriptor, isDelegated); + String defaultPropertyName = KotlinTypeMapper.mapDefaultFieldName(descriptor, isDelegated); Map descriptor2Name = fieldNames.get(defaultPropertyName); if (descriptor2Name == null) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java index c67353948ba..501ccc801c9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor; import org.jetbrains.kotlin.resolve.inline.InlineUtil; @@ -57,7 +57,7 @@ public class MethodContext extends CodegenContext { return super.getParentContext(); } - public StackValue getReceiverExpression(JetTypeMapper typeMapper) { + public StackValue getReceiverExpression(KotlinTypeMapper typeMapper) { assert getCallableDescriptorWithReceiver() != null; @SuppressWarnings("ConstantConditions") Type asmType = typeMapper.mapType(getCallableDescriptorWithReceiver().getExtensionReceiverParameter().getType()); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java index 9399fb2659e..2fac1d170e8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.FieldInfo; import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.kotlin.psi.KtAnonymousInitializer; @@ -40,7 +40,7 @@ public class ScriptContext extends ClassContext { private final KtExpression lastStatement; public ScriptContext( - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @NotNull ScriptDescriptor scriptDescriptor, @NotNull List earlierScripts, @NotNull ClassDescriptor contextDescriptor, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt index 8a2d4f957b6..a79e405db40 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen.extensions import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor -import org.jetbrains.kotlin.codegen.state.JetTypeMapper +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall @@ -31,7 +31,7 @@ interface ExpressionCodegenExtension { "org.jetbrains.kotlin.expressionCodegenExtension", ExpressionCodegenExtension::class.java) class Context( - val typeMapper: JetTypeMapper, + val typeMapper: KotlinTypeMapper, val v: InstructionAdapter ) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java index 3ccc40562d8..4af194c6f2f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.codegen.ClassBuilder; import org.jetbrains.kotlin.codegen.FieldInfo; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.tree.*; @@ -38,7 +38,7 @@ public class AnonymousObjectTransformer { protected final GenerationState state; - protected final JetTypeMapper typeMapper; + protected final KotlinTypeMapper typeMapper; private final InlineResult transformationResult; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index 20d28f38a34..83d32915c3f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.context.*; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicArrayConstructorsKt; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents; @@ -69,7 +69,7 @@ import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.isFun public class InlineCodegen extends CallGenerator { private final GenerationState state; - private final JetTypeMapper typeMapper; + private final KotlinTypeMapper typeMapper; private final FunctionDescriptor functionDescriptor; private final JvmMethodSignature jvmSignature; @@ -189,7 +189,7 @@ public class InlineCodegen extends CallGenerator { @NotNull CodegenContext context, boolean callDefault, @NotNull GenerationState state) throws IOException { - JetTypeMapper typeMapper = state.getTypeMapper(); + KotlinTypeMapper typeMapper = state.getTypeMapper(); Method asmMethod = callDefault ? typeMapper.mapDefaultMethod(functionDescriptor, context.getContextKind()) : jvmSignature.getAsmMethod(); @@ -208,7 +208,7 @@ public class InlineCodegen extends CallGenerator { } } else if (functionDescriptor instanceof DeserializedSimpleFunctionDescriptor) { - JetTypeMapper.ContainingClassesInfo containingClasses = typeMapper.getContainingClassesForDeserializedCallable( + KotlinTypeMapper.ContainingClassesInfo containingClasses = typeMapper.getContainingClassesForDeserializedCallable( (DeserializedSimpleFunctionDescriptor) functionDescriptor); ClassId containerId = containingClasses.getImplClassId(); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java index 29c7a9bf467..8c27e6dd901 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicArrayConstructorsKt; import org.jetbrains.kotlin.codegen.optimization.common.UtilKt; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.fileClasses.FileClasses; import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider; @@ -183,7 +183,7 @@ public class InlineCodegenUtil { public static String getInlineName( @NotNull CodegenContext codegenContext, - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @NotNull JvmFileClassesProvider fileClassesManager ) { return getInlineName(codegenContext, codegenContext.getContextDescriptor(), typeMapper, fileClassesManager); @@ -192,7 +192,7 @@ public class InlineCodegenUtil { private static String getInlineName( @NotNull CodegenContext codegenContext, @NotNull DeclarationDescriptor currentDescriptor, - @NotNull JetTypeMapper typeMapper, + @NotNull KotlinTypeMapper typeMapper, @NotNull JvmFileClassesProvider fileClassesProvider ) { if (currentDescriptor instanceof PackageFragmentDescriptor) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java index 34c35fcad9b..0b65515e9b7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java @@ -21,14 +21,13 @@ import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; import org.jetbrains.kotlin.codegen.context.EnclosedValueDescriptor; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtLambdaExpression; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.jvm.AsmTypes; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.Method; import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode; @@ -44,7 +43,7 @@ public class LambdaInfo implements CapturedParamOwner, LabelOwner { public final KtExpression expression; - private final JetTypeMapper typeMapper; + private final KotlinTypeMapper typeMapper; @NotNull public final Set labels; @@ -63,7 +62,7 @@ public class LambdaInfo implements CapturedParamOwner, LabelOwner { private final Type closureClassType; - LambdaInfo(@NotNull KtExpression expr, @NotNull JetTypeMapper typeMapper, boolean isCrossInline) { + LambdaInfo(@NotNull KtExpression expr, @NotNull KotlinTypeMapper typeMapper, boolean isCrossInline) { this.isCrossInline = isCrossInline; this.expression = expr instanceof KtLambdaExpression ? ((KtLambdaExpression) expr).getFunctionLiteral() : expr; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java index 2f1d882237e..39b2891bb44 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.codegen.ClosureCodegen; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.optimization.MandatoryMethodTransformer; -import org.jetbrains.kotlin.codegen.state.JetTypeMapper; +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper; import org.jetbrains.kotlin.utils.SmartSet; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; @@ -58,7 +58,7 @@ public class MethodInliner { private final InlineCallSiteInfo inlineCallSiteInfo; - private final JetTypeMapper typeMapper; + private final KotlinTypeMapper typeMapper; private final List invokeCalls = new ArrayList(); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt index 1215f90fefd..902f2533f4e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen.inline -import org.jetbrains.kotlin.codegen.state.JetTypeMapper +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryPackageSourceElement @@ -34,7 +34,7 @@ val FunctionDescriptor.sourceFilePath: String return containingFile?.virtualFile?.canonicalPath!! } -fun FunctionDescriptor.getClassFilePath(typeMapper: JetTypeMapper, cache: IncrementalCache): String { +fun FunctionDescriptor.getClassFilePath(typeMapper: KotlinTypeMapper, cache: IncrementalCache): String { val container = containingDeclaration as? DeclarationDescriptorWithSource val source = container?.source diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt index f1f1f1999ca..a236d2d3d43 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen.serialization -import org.jetbrains.kotlin.codegen.state.JetTypeMapper +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.load.kotlin.JvmNameResolver @@ -30,7 +30,7 @@ import java.io.OutputStream import java.util.* // TODO: optimize by reordering records to minimize storage of 'range' fields -class JvmStringTable(private val typeMapper: JetTypeMapper) : StringTable { +class JvmStringTable(private val typeMapper: KotlinTypeMapper) : StringTable { val strings = ArrayList() private val records = ArrayList() private val map = HashMap() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt index 2732a60cb25..c657bfbb8bc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.signature import org.jetbrains.kotlin.codegen.ClassBuilderMode import org.jetbrains.kotlin.codegen.state.IncompatibleClassTracker -import org.jetbrains.kotlin.codegen.state.JetTypeMapper +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider import org.jetbrains.kotlin.load.java.JvmAbi @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper class KotlinToJvmSignatureMapperImpl : KotlinToJvmSignatureMapper { - // We use empty BindingContext, because it is only used by JetTypeMapper for purposes irrelevant to the needs of this class - private val typeMapper = JetTypeMapper(BindingContext.EMPTY, ClassBuilderMode.LIGHT_CLASSES, NoResolveFileClassesProvider, null, + // We use empty BindingContext, because it is only used by KotlinTypeMapper for purposes irrelevant to the needs of this class + private val typeMapper = KotlinTypeMapper(BindingContext.EMPTY, ClassBuilderMode.LIGHT_CLASSES, NoResolveFileClassesProvider, null, IncompatibleClassTracker.DoNothing, JvmAbi.DEFAULT_MODULE_NAME) override fun mapToJvmMethodSignature(function: FunctionDescriptor) = typeMapper.mapAsmMethod(function) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt index 8eae8da0f59..aae4560b655 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt @@ -52,7 +52,7 @@ class BuilderFactoryForDuplicateSignatureDiagnostics( ) : SignatureCollectingClassBuilderFactory(builderFactory) { // Avoid errors when some classes are not loaded for some reason - private val typeMapper = JetTypeMapper(bindingContext, ClassBuilderMode.LIGHT_CLASSES, fileClassesProvider, incrementalCache, + private val typeMapper = KotlinTypeMapper(bindingContext, ClassBuilderMode.LIGHT_CLASSES, fileClassesProvider, incrementalCache, IncompatibleClassTracker.DoNothing, moduleName) private val reportDiagnosticsTasks = ArrayList<() -> Unit>() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt index bfffcedaa17..c5ebcf37e7c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt @@ -110,7 +110,7 @@ class GenerationState @JvmOverloads constructor( val classBuilderMode: ClassBuilderMode = builderFactory.classBuilderMode val bindingTrace: BindingTrace = DelegatingBindingTrace(bindingContext, "trace in GenerationState") val bindingContext: BindingContext = bindingTrace.bindingContext - val typeMapper: JetTypeMapper = JetTypeMapper( + val typeMapper: KotlinTypeMapper = KotlinTypeMapper( this.bindingContext, classBuilderMode, fileClassesProvider, getIncrementalCacheForThisTarget(), IncompatibleClassTrackerImpl(extraJvmDiagnosticsTrace), this.moduleName ) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java similarity index 99% rename from compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java rename to compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java index 77ea7225a23..cf9f1ed4685 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java @@ -95,7 +95,7 @@ import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.*; import static org.jetbrains.org.objectweb.asm.Opcodes.*; -public class JetTypeMapper { +public class KotlinTypeMapper { private final BindingContext bindingContext; private final ClassBuilderMode classBuilderMode; private final JvmFileClassesProvider fileClassesProvider; @@ -103,7 +103,7 @@ public class JetTypeMapper { private final IncompatibleClassTracker incompatibleClassTracker; private final String moduleName; - public JetTypeMapper( + public KotlinTypeMapper( @NotNull BindingContext bindingContext, @NotNull ClassBuilderMode classBuilderMode, @NotNull JvmFileClassesProvider fileClassesProvider, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/ClassMapperLite.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/ClassMapperLite.kt index bc0327c451b..38f41eec15a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/ClassMapperLite.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/ClassMapperLite.kt @@ -21,10 +21,10 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType -// The purpose of this class is to map Kotlin classes to JVM bytecode desc strings, as JetTypeMapper does in the backend. +// The purpose of this class is to map Kotlin classes to JVM bytecode desc strings, as KotlinTypeMapper does in the backend. // It's used as an optimization during serialization/deserialization: if there's no JVM signature for a method/property/constructor, // it means that the JVM signature should be trivially computable from the Kotlin signature with this class. -// It's not required to support everything in JetTypeMapper, but the more it does, the more we save on JVM signatures in proto metadata. +// It's not required to support everything in KotlinTypeMapper, but the more it does, the more we save on JVM signatures in proto metadata. // Note that improving the behavior of this class may break binary compatibility of code compiled by Kotlin, because it may make // the new compiler skip writing the signatures it now thinks are trivial, and the old compiler would recreate them incorrectly. object ClassMapperLite { diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt index 1530320fca7..962aefdabee 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt @@ -45,7 +45,7 @@ import com.sun.jdi.ReferenceType import com.sun.jdi.request.ClassPrepareRequest import org.jetbrains.kotlin.codegen.binding.CodegenBinding import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil -import org.jetbrains.kotlin.codegen.state.JetTypeMapper +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor @@ -328,7 +328,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq private fun getInternalClassNameForElement( element: KtElement, - typeMapper: JetTypeMapper, + typeMapper: KotlinTypeMapper, file: KtFile, isInLibrary: Boolean, withInlines: Boolean @@ -404,7 +404,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq return CachedClassNames(getClassNameForFile(file)) } - private fun getClassNameForClass(klass: KtClassOrObject, typeMapper: JetTypeMapper) = klass.readAction { getJvmInternalNameForImpl(typeMapper, it) } + private fun getClassNameForClass(klass: KtClassOrObject, typeMapper: KotlinTypeMapper) = klass.readAction { getJvmInternalNameForImpl(typeMapper, it) } private fun getClassNameForFile(file: KtFile) = file.readAction { NoResolveFileClassesProvider.getFileClassInternalName(it) } private val TYPES_TO_CALCULATE_CLASSNAME: Array> = @@ -423,7 +423,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq return readAction { PsiTreeUtil.getParentOfType(notPositionedElement, *TYPES_TO_CALCULATE_CLASSNAME) } } - fun getJvmInternalNameForPropertyOwner(typeMapper: JetTypeMapper, descriptor: PropertyDescriptor): String { + fun getJvmInternalNameForPropertyOwner(typeMapper: KotlinTypeMapper, descriptor: PropertyDescriptor): String { return descriptor.readAction { typeMapper.mapOwner( if (JvmAbi.isPropertyWithBackingFieldInOuterClass(it)) it.containingDeclaration else it @@ -431,7 +431,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq } } - private fun getJvmInternalNameForImpl(typeMapper: JetTypeMapper, ktClass: KtClassOrObject): String? { + private fun getJvmInternalNameForImpl(typeMapper: KotlinTypeMapper, ktClass: KtClassOrObject): String? { val classDescriptor = typeMapper.bindingContext.get(BindingContext.CLASS, ktClass) ?: return null if (ktClass is KtClass && ktClass.isInterface()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt index 80474b1dce2..e848dee1152 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt @@ -32,7 +32,7 @@ import org.jetbrains.annotations.TestOnly import org.jetbrains.eval4j.Value import org.jetbrains.kotlin.codegen.ClassBuilderFactories import org.jetbrains.kotlin.codegen.state.GenerationState -import org.jetbrains.kotlin.codegen.state.JetTypeMapper +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.idea.caches.resolve.analyzeAndGetResult import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult @@ -60,7 +60,7 @@ class KotlinDebuggerCaches(private val project: Project) { private val cachedTypeMappers = CachedValuesManager.getManager(project).createCachedValue( { - CachedValueProvider.Result>( + CachedValueProvider.Result>( hashMapOf(), PsiModificationTracker.MODIFICATION_COUNT) }, false) @@ -111,7 +111,7 @@ class KotlinDebuggerCaches(private val project: Project) { } } - fun getOrCreateTypeMapper(psiElement: PsiElement): JetTypeMapper { + fun getOrCreateTypeMapper(psiElement: PsiElement): KotlinTypeMapper { val cache = getInstance(runReadAction { psiElement.project }) synchronized(cache.cachedTypeMappers) { val typeMappersCache = cache.cachedTypeMappers.value @@ -141,7 +141,7 @@ class KotlinDebuggerCaches(private val project: Project) { } } - private fun createTypeMapperForLibraryFile(element: KtElement, file: KtFile): JetTypeMapper { + private fun createTypeMapperForLibraryFile(element: KtElement, file: KtFile): KotlinTypeMapper { return runReadAction { val analysisResult = element.analyzeAndGetResult() @@ -159,7 +159,7 @@ class KotlinDebuggerCaches(private val project: Project) { private fun getElementToCreateTypeMapperForLibraryFile(element: PsiElement?) = runReadAction { if (element is KtElement) element else PsiTreeUtil.getParentOfType(element, KtElement::class.java)!! } - private fun createTypeMapperForSourceFile(file: KtFile): JetTypeMapper { + private fun createTypeMapperForSourceFile(file: KtFile): KotlinTypeMapper { return runReadAction { val analysisResult = file.analyzeFullyAndGetResult() analysisResult.throwIfError() @@ -175,7 +175,7 @@ class KotlinDebuggerCaches(private val project: Project) { } } - @TestOnly fun addTypeMapper(file: KtFile, typeMapper: JetTypeMapper) { + @TestOnly fun addTypeMapper(file: KtFile, typeMapper: KotlinTypeMapper) { getInstance(file.project).cachedTypeMappers.value[file] = typeMapper } } diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt index 82a1de126f6..9b6e12da51c 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.codegen.FunctionCodegen import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension import org.jetbrains.kotlin.codegen.state.GenerationState -import org.jetbrains.kotlin.codegen.state.JetTypeMapper +import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaClassDescriptor import org.jetbrains.kotlin.psi.KtClassOrObject @@ -165,7 +165,7 @@ class AndroidExpressionCodegenExtension : ExpressionCodegenExtension { private class SyntheticProperty( val receiver: StackValue, - val typeMapper: JetTypeMapper, + val typeMapper: KotlinTypeMapper, val propertyDescriptor: PropertyDescriptor, val receiverDescriptor: ClassDescriptor, val androidClassType: AndroidClassType,