From e9badcbcc7d4bba11b1d66387312c0bf724663fb Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 29 Dec 2014 18:55:30 +0300 Subject: [PATCH] Rename AsmTypeConstants -> AsmTypes --- .../src/org/jetbrains/jet/codegen/AsmUtil.java | 9 ++++----- .../jet/codegen/ExpressionCodegen.java | 5 ++--- .../jetbrains/jet/codegen/FunctionCodegen.java | 7 +++++-- .../jet/codegen/ImplementationBodyCodegen.java | 13 ++++++------- .../jetbrains/jet/codegen/MemberCodegen.java | 6 ++++-- .../jetbrains/jet/codegen/PackageCodegen.java | 4 ++-- .../jetbrains/jet/codegen/PropertyCodegen.java | 2 +- .../jet/codegen/SamWrapperCodegen.java | 2 +- .../jetbrains/jet/codegen/ScriptCodegen.java | 2 +- .../org/jetbrains/jet/codegen/StackValue.java | 2 +- .../jet/codegen/context/ConstructorContext.java | 2 +- .../jet/codegen/inline/InlineCodegen.java | 9 ++++++--- .../jet/codegen/inline/InlineCodegenUtil.java | 5 ++--- .../jet/codegen/inline/LambdaInfo.java | 4 ++-- .../jet/codegen/inline/LocalVarRemapper.java | 8 ++++---- .../jet/codegen/inline/ParameterInfo.java | 6 +++--- .../jet/codegen/intrinsics/ArrayIterator.java | 2 +- .../jetbrains/jet/codegen/intrinsics/Clone.java | 2 +- .../jet/codegen/intrinsics/Concat.java | 6 +++--- .../jet/codegen/intrinsics/CopyToArray.java | 8 ++++---- .../jetbrains/jet/codegen/intrinsics/Equals.kt | 15 ++++++++------- .../jet/codegen/intrinsics/HashCode.kt | 17 +++++++++-------- .../jet/codegen/intrinsics/IdentityEquals.java | 2 +- .../jet/codegen/intrinsics/IteratorNext.java | 4 ++-- .../codegen/intrinsics/JavaClassFunction.java | 2 +- .../codegen/intrinsics/JavaClassProperty.java | 2 +- .../codegen/intrinsics/MonitorInstruction.java | 2 +- .../jet/codegen/intrinsics/StringPlus.kt | 4 ++-- .../jet/codegen/state/JetTypeMapper.java | 8 +++++--- .../MappingClassesForWhenByEnumCodegen.java | 2 +- .../{AsmTypeConstants.java => AsmTypes.java} | 13 +++++-------- .../java/mapping/KotlinToJavaTypesMap.java | 6 +++--- 32 files changed, 93 insertions(+), 88 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{AsmTypeConstants.java => AsmTypes.java} (85%) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java index ba9d4d05df6..9065f63acbf 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java @@ -58,8 +58,7 @@ import java.util.Set; import static org.jetbrains.jet.codegen.JvmCodegenUtil.isInterface; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JAVA_STRING_TYPE; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.ABI_VERSION_FIELD_NAME; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.jet.lang.resolve.java.mapping.PrimitiveTypesUtil.asmTypeForPrimitive; @@ -361,16 +360,16 @@ public class AsmUtil { private static Type stringValueOfType(Type type) { int sort = type.getSort(); return sort == Type.OBJECT || sort == Type.ARRAY - ? AsmTypeConstants.OBJECT_TYPE + ? OBJECT_TYPE : sort == Type.BYTE || sort == Type.SHORT ? Type.INT_TYPE : type; } private static Type stringBuilderAppendType(Type type) { switch (type.getSort()) { case Type.OBJECT: - return STRING_BUILDER_OBJECT_APPEND_ARG_TYPES.contains(type) ? type : AsmTypeConstants.OBJECT_TYPE; + return STRING_BUILDER_OBJECT_APPEND_ARG_TYPES.contains(type) ? type : OBJECT_TYPE; case Type.ARRAY: - return AsmTypeConstants.OBJECT_TYPE; + return OBJECT_TYPE; case Type.BYTE: case Type.SHORT: return Type.INT_TYPE; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 51d556c4343..a08fa35665a 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -56,7 +56,6 @@ import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; @@ -90,7 +89,7 @@ import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull; import static org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.*; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.TraitImpl; @@ -1315,7 +1314,7 @@ public class ExpressionCodegen extends JetVisitor implem return StackValue.constant(constantValue.toString(), type); } else { - return StackValue.operation(AsmTypeConstants.JAVA_STRING_TYPE, new Function1() { + return StackValue.operation(JAVA_STRING_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter v) { genStringBuilderConstructor(v); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index bb022f0fe20..32315221fa6 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -55,7 +55,10 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.Approximation; import org.jetbrains.jet.lang.types.TypesPackage; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.org.objectweb.asm.*; +import org.jetbrains.org.objectweb.asm.AnnotationVisitor; +import org.jetbrains.org.objectweb.asm.Label; +import org.jetbrains.org.objectweb.asm.MethodVisitor; +import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.commons.Method; import org.jetbrains.org.objectweb.asm.util.TraceMethodVisitor; @@ -71,7 +74,7 @@ import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.D import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.callableDescriptorToDeclaration; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isFunctionLiteral; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.OLD_JET_VALUE_PARAMETER_ANNOTATION; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.Synthetic; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index 724301ed5c2..e1c37503f9c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -48,7 +48,6 @@ import org.jetbrains.jet.lang.resolve.calls.model.DefaultValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VarargValueArgument; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaCallableMemberDescriptor; @@ -75,7 +74,7 @@ import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil. import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.classDescriptorToDeclaration; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.*; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.*; import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; @@ -361,7 +360,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } protected void getSuperClass() { - superClassAsmType = AsmTypeConstants.OBJECT_TYPE; + superClassAsmType = OBJECT_TYPE; superClassType = null; List delegationSpecifiers = myClass.getDelegationSpecifiers(); @@ -548,16 +547,16 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { Label ne = new Label(); iv.load(0, OBJECT_TYPE); - iv.load(1, AsmTypeConstants.OBJECT_TYPE); + iv.load(1, OBJECT_TYPE); iv.ifacmpeq(eq); - iv.load(1, AsmTypeConstants.OBJECT_TYPE); + iv.load(1, OBJECT_TYPE); iv.instanceOf(classAsmType); iv.ifeq(ne); - iv.load(1, AsmTypeConstants.OBJECT_TYPE); + iv.load(1, OBJECT_TYPE); iv.checkcast(classAsmType); - iv.store(2, AsmTypeConstants.OBJECT_TYPE); + iv.store(2, OBJECT_TYPE); for (PropertyDescriptor propertyDescriptor : properties) { Type asmType = typeMapper.mapType(propertyDescriptor); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java index 63ed742cad0..d1603d1ac5a 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java @@ -47,13 +47,15 @@ import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.commons.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive; import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; import static org.jetbrains.jet.lang.descriptors.SourceElement.NO_SOURCE; import static org.jetbrains.jet.lang.resolve.BindingContext.VARIABLE; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.*; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.TraitImpl; import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java index 31fc8399429..d38e79e11e7 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java @@ -67,8 +67,8 @@ import java.util.*; import static org.jetbrains.jet.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses; import static org.jetbrains.jet.codegen.AsmUtil.method; import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil.createNameResolver; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.K_PACKAGE_IMPL_TYPE; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.K_PACKAGE_IMPL_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.*; import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java index 10dc6ed6592..5c99890a751 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java @@ -51,7 +51,7 @@ import static org.jetbrains.jet.codegen.JvmCodegenUtil.isInterface; import static org.jetbrains.jet.codegen.JvmSerializationBindings.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.PROPERTY_METADATA_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.PROPERTY_METADATA_TYPE; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.org.objectweb.asm.Opcodes.*; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java index be3d11db98e..d32345b0f04 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/SamWrapperCodegen.java @@ -38,7 +38,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.Collections; import static org.jetbrains.jet.codegen.AsmUtil.*; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.org.objectweb.asm.Opcodes.*; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java index 65573c0b94f..457729f94e9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java @@ -41,7 +41,7 @@ import java.util.List; import static org.jetbrains.jet.codegen.AsmUtil.method; import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLASS_FOR_SCRIPT; import static org.jetbrains.jet.codegen.binding.CodegenBinding.asmTypeForScriptDescriptor; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.*; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.org.objectweb.asm.Opcodes.*; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java index ea2c0bc8108..fa5511a1e64 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java @@ -46,7 +46,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.jet.codegen.AsmUtil.*; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.*; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public abstract class StackValue { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java index 5ea4f3d8211..f80008d961e 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.codegen.StackValue; import org.jetbrains.jet.codegen.binding.MutableClosure; import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; public class ConstructorContext extends MethodContext { private static final StackValue LOCAL_1 = StackValue.local(1, OBJECT_TYPE); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java index 363204defa5..4947f82b204 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegen.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; +import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; @@ -51,7 +51,10 @@ import org.jetbrains.org.objectweb.asm.tree.MethodNode; import org.jetbrains.org.objectweb.asm.tree.TryCatchBlockNode; import java.io.IOException; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; import static org.jetbrains.jet.codegen.AsmUtil.getMethodAsmFlags; import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive; @@ -418,7 +421,7 @@ public class InlineCodegen extends CallGenerator { List valueParameters = jvmSignature.getValueParameters(); if (!isStaticMethod(functionDescriptor, context)) { - invocationParamBuilder.addNextParameter(AsmTypeConstants.OBJECT_TYPE, false, null); + invocationParamBuilder.addNextParameter(AsmTypes.OBJECT_TYPE, false, null); } for (JvmMethodParameterSignature param : valueParameters) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java index 756ba852b80..57d05dc30af 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; +import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils; @@ -51,7 +51,6 @@ import org.jetbrains.org.objectweb.asm.util.Textifier; import org.jetbrains.org.objectweb.asm.util.TraceMethodVisitor; import java.io.IOException; -import java.io.InputStream; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Arrays; @@ -312,7 +311,7 @@ public class InlineCodegenUtil { case Opcodes.DRETURN: return Type.DOUBLE_TYPE; case Opcodes.FRETURN: return Type.FLOAT_TYPE; case Opcodes.LRETURN: return Type.LONG_TYPE; - default: return AsmTypeConstants.OBJECT_TYPE; + default: return AsmTypes.OBJECT_TYPE; } } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java index 48911b779b6..44ed13ec29f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LambdaInfo.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.psi.JetFunctionLiteral; import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; +import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode; import org.jetbrains.org.objectweb.asm.tree.MethodNode; @@ -151,7 +151,7 @@ public class LambdaInfo implements CapturedParamOwner, LabelOwner { public Parameters addAllParameters(FieldRemapper remapper) { ParametersBuilder builder = ParametersBuilder.newBuilder(); //add skipped this cause inlined lambda doesn't have it - builder.addThis(AsmTypeConstants.OBJECT_TYPE, true).setLambda(this); + builder.addThis(AsmTypes.OBJECT_TYPE, true).setLambda(this); List valueParameters = getFunctionDescriptor().getValueParameters(); for (ValueParameterDescriptor parameter : valueParameters) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LocalVarRemapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LocalVarRemapper.java index e25676f16e4..8ae0ad269ca 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/LocalVarRemapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/LocalVarRemapper.java @@ -18,12 +18,12 @@ package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.codegen.StackValue; +import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; -import org.jetbrains.jet.codegen.StackValue; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; import static org.jetbrains.jet.codegen.inline.LocalVarRemapper.RemapStatus.*; @@ -48,7 +48,7 @@ public class LocalVarRemapper { int index = 0; for (ParameterInfo info : params) { if (!info.isSkippedOrRemapped()) { - remapValues[index] = StackValue.local(realSize, AsmTypeConstants.OBJECT_TYPE); + remapValues[index] = StackValue.local(realSize, AsmTypes.OBJECT_TYPE); realSize += info.getType().getSize(); } else { remapValues[index] = info.isRemapped() ? info.getRemapValue() : null; @@ -77,7 +77,7 @@ public class LocalVarRemapper { remappedIndex = actualParamsSize - params.totalSize() + index; //captured params not used directly in this inlined method, they used in closure } - return new RemapInfo(StackValue.local(remappedIndex + additionalShift, AsmTypeConstants.OBJECT_TYPE), null, SHIFT); + return new RemapInfo(StackValue.local(remappedIndex + additionalShift, AsmTypes.OBJECT_TYPE), null, SHIFT); } public RemapInfo remap(int index) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java index c6dbe80e407..5a877117321 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/ParameterInfo.java @@ -18,13 +18,13 @@ package org.jetbrains.jet.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.jet.codegen.StackValue; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; +import org.jetbrains.jet.lang.resolve.java.AsmTypes; +import org.jetbrains.org.objectweb.asm.Type; class ParameterInfo { - public static final ParameterInfo STUB = new ParameterInfo(AsmTypeConstants.OBJECT_TYPE, true, -1, -1); + public static final ParameterInfo STUB = new ParameterInfo(AsmTypes.OBJECT_TYPE, true, -1, -1); protected final int index; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java index 79f1cf6c378..0dfed6520d9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java @@ -37,7 +37,7 @@ import java.util.Iterator; import java.util.List; import static org.jetbrains.jet.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; import static org.jetbrains.jet.lang.resolve.java.mapping.PrimitiveTypesUtil.asmTypeForPrimitive; import static org.jetbrains.jet.lang.types.lang.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Clone.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Clone.java index 18e52fb0728..b0b5f3b12a8 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Clone.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Clone.java @@ -33,7 +33,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; public class Clone extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Concat.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Concat.java index a9c151aaa5e..86f845aa0ca 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Concat.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Concat.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.codegen.ExpressionCodegen; import org.jetbrains.jet.codegen.StackValue; import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; +import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; @@ -29,7 +29,7 @@ import java.util.List; import static org.jetbrains.jet.codegen.AsmUtil.genInvokeAppendMethod; import static org.jetbrains.jet.codegen.AsmUtil.genStringBuilderConstructor; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JAVA_STRING_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.JAVA_STRING_TYPE; public class Concat extends IntrinsicMethod { @NotNull @@ -50,7 +50,7 @@ public class Concat extends IntrinsicMethod { } else { // LHS.plus(RHS) - receiver.put(AsmTypeConstants.OBJECT_TYPE, v); + receiver.put(AsmTypes.OBJECT_TYPE, v); genStringBuilderConstructor(v); v.swap(); genInvokeAppendMethod(v, returnType); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CopyToArray.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CopyToArray.java index b7c880e89b7..ead36e9fb9c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CopyToArray.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CopyToArray.java @@ -19,16 +19,16 @@ package org.jetbrains.jet.codegen.intrinsics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.org.objectweb.asm.Type; -import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.jet.codegen.ExpressionCodegen; import org.jetbrains.jet.codegen.StackValue; import org.jetbrains.jet.lang.psi.JetExpression; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.org.objectweb.asm.Type; +import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; public class CopyToArray extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Equals.kt b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Equals.kt index f1054c0e073..59757bcb9fb 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Equals.kt +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Equals.kt @@ -18,7 +18,6 @@ package org.jetbrains.jet.codegen.intrinsics import com.intellij.psi.PsiElement import org.jetbrains.org.objectweb.asm.Type -import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.jet.codegen.ExpressionCodegen import org.jetbrains.jet.codegen.StackValue import org.jetbrains.jet.lang.psi.JetCallExpression @@ -26,14 +25,16 @@ import org.jetbrains.jet.lang.psi.JetExpression import org.jetbrains.jet.lexer.JetTokens import org.jetbrains.jet.codegen.AsmUtil.genEqualsForExpressionsOnStack -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE +import org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE public class Equals : LazyIntrinsicMethod() { - override fun generateImpl(codegen: ExpressionCodegen, - returnType: Type, - element: PsiElement?, - arguments: List, - receiver: StackValue): StackValue { + override fun generateImpl( + codegen: ExpressionCodegen, + returnType: Type, + element: PsiElement?, + arguments: List, + receiver: StackValue + ): StackValue { val leftExpr: StackValue val rightExpr: JetExpression if (element is JetCallExpression) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/HashCode.kt b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/HashCode.kt index c803ea30feb..05e4c7db2dc 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/HashCode.kt +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/HashCode.kt @@ -22,17 +22,18 @@ import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.jet.codegen.ExpressionCodegen import org.jetbrains.jet.codegen.StackValue import org.jetbrains.jet.lang.psi.JetExpression -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants +import org.jetbrains.jet.lang.resolve.java.AsmTypes public class HashCode : LazyIntrinsicMethod() { - override fun generateImpl(codegen: ExpressionCodegen, - returnType: Type, - element: PsiElement?, - arguments: List, - receiver: StackValue): StackValue { - + override fun generateImpl( + codegen: ExpressionCodegen, + returnType: Type, + element: PsiElement?, + arguments: List, + receiver: StackValue + ): StackValue { return StackValue.operation(Type.INT_TYPE) { - receiver.put(AsmTypeConstants.OBJECT_TYPE, it) + receiver.put(AsmTypes.OBJECT_TYPE, it) it.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Object", "hashCode", "()I", false) } } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IdentityEquals.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IdentityEquals.java index 838967dff3d..7e864e8de28 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IdentityEquals.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IdentityEquals.java @@ -28,7 +28,7 @@ import org.jetbrains.org.objectweb.asm.Type; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; public class IdentityEquals extends LazyIntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorNext.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorNext.java index b4b58a3eb70..ad826487a3e 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorNext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorNext.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.codegen.ExpressionCodegen; import org.jetbrains.jet.codegen.StackValue; import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; +import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; @@ -68,7 +68,7 @@ public class IteratorNext extends IntrinsicMethod { else { throw new UnsupportedOperationException(); } - receiver.put(AsmTypeConstants.OBJECT_TYPE, v); + receiver.put(AsmTypes.OBJECT_TYPE, v); v.invokevirtual(BUILT_INS_PACKAGE_FQ_NAME + "/" + name + "Iterator", "next" + name, "()" + returnType.getDescriptor(), false); return returnType; } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassFunction.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassFunction.java index ab7ddfb38b9..6d89bd0e0d1 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassFunction.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassFunction.java @@ -33,7 +33,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import static org.jetbrains.jet.codegen.AsmUtil.putJavaLangClassInstance; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; public class JavaClassFunction extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassProperty.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassProperty.java index 62b21106fbc..01779b1afcc 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassProperty.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassProperty.java @@ -30,7 +30,7 @@ import java.util.List; import static org.jetbrains.jet.codegen.AsmUtil.boxType; import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; public class JavaClassProperty extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/MonitorInstruction.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/MonitorInstruction.java index 6f87aa958d0..ccea4469580 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/MonitorInstruction.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/MonitorInstruction.java @@ -34,7 +34,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; public class MonitorInstruction extends IntrinsicMethod { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringPlus.kt b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringPlus.kt index 3c5b3b9b775..497c00dfb44 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringPlus.kt +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringPlus.kt @@ -22,8 +22,8 @@ import org.jetbrains.jet.codegen.StackValue import org.jetbrains.jet.lang.psi.JetExpression import org.jetbrains.org.objectweb.asm.Type -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JAVA_STRING_TYPE -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE +import org.jetbrains.jet.lang.resolve.java.AsmTypes.JAVA_STRING_TYPE +import org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE public class StringPlus : LazyIntrinsicMethod() { override fun generateImpl( diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java index 1a4d71cf4a2..169f7d6f5a6 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java @@ -32,14 +32,16 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; +import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; import org.jetbrains.jet.lang.resolve.calls.model.DefaultValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.StringValue; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; +import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; @@ -441,7 +443,7 @@ public class JetTypeMapper { if (signatureVisitor != null) { if (jetType.getArguments().isEmpty()) { if (arrayParameter && howThisTypeIsUsed == Variance.IN_VARIANCE) { - asmType = AsmTypeConstants.OBJECT_TYPE; + asmType = AsmTypes.OBJECT_TYPE; } signatureVisitor.writeAsmType(asmType); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/MappingClassesForWhenByEnumCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/when/MappingClassesForWhenByEnumCodegen.java index 87f4db3d555..ba111eb5002 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/when/MappingClassesForWhenByEnumCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/when/MappingClassesForWhenByEnumCodegen.java @@ -30,7 +30,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE; +import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class MappingClassesForWhenByEnumCodegen { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypes.java similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypes.java index bcf3c54ce68..d136b095749 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypes.java @@ -22,19 +22,16 @@ import org.jetbrains.org.objectweb.asm.Type; import java.util.HashMap; import java.util.Map; -import static org.jetbrains.jet.lang.types.lang.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; - -public class AsmTypeConstants { +public class AsmTypes { private static final Map, Type> TYPES_MAP = new HashMap, Type>(); public static final Type OBJECT_TYPE = getType(Object.class); public static final Type JAVA_STRING_TYPE = getType(String.class); public static final Type JAVA_THROWABLE_TYPE = getType(Throwable.class); - public static final Type UNIT_TYPE = Type.getObjectType(BUILT_INS_PACKAGE_FQ_NAME + "/Unit"); - public static final Type FUNCTION1_TYPE = Type.getObjectType(BUILT_INS_PACKAGE_FQ_NAME + "/Function1"); - public static final Type PROPERTY_METADATA_TYPE = Type.getObjectType(BUILT_INS_PACKAGE_FQ_NAME + "/PropertyMetadata"); - public static final Type PROPERTY_METADATA_IMPL_TYPE = Type.getObjectType(BUILT_INS_PACKAGE_FQ_NAME + "/PropertyMetadataImpl"); + public static final Type UNIT_TYPE = Type.getObjectType("kotlin/Unit"); + public static final Type PROPERTY_METADATA_TYPE = Type.getObjectType("kotlin/PropertyMetadata"); + public static final Type PROPERTY_METADATA_IMPL_TYPE = Type.getObjectType("kotlin/PropertyMetadataImpl"); public static final Type K_MEMBER_PROPERTY_TYPE = Type.getObjectType("kotlin/reflect/KMemberProperty"); public static final Type K_MUTABLE_MEMBER_PROPERTY_TYPE = Type.getObjectType("kotlin/reflect/KMutableMemberProperty"); @@ -65,6 +62,6 @@ public class AsmTypeConstants { return type; } - private AsmTypeConstants() { + private AsmTypes() { } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java index a9494516972..51aeab6e329 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java @@ -18,15 +18,15 @@ package org.jetbrains.jet.lang.resolve.java.mapping; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants; +import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.org.objectweb.asm.Type; import java.util.HashMap; import java.util.Map; @@ -97,7 +97,7 @@ public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder { protected void register(@NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction) { if (direction == Direction.BOTH || direction == Direction.KOTLIN_TO_JAVA) { FqName fqName = DescriptorUtils.getFqNameSafe(kotlinDescriptor); - register(fqName, AsmTypeConstants.getType(javaClass)); + register(fqName, AsmTypes.getType(javaClass)); registerFqName(fqName, new FqName(javaClass.getCanonicalName())); } }