diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java index 77c8399907a..7cd4c377777 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java @@ -168,16 +168,12 @@ public class PropertyCodegen extends GenerationStateAware { if (descriptor.getAnnotations().isEmpty()) return; ReceiverParameterDescriptor receiver = descriptor.getReceiverParameter(); - Type receiverAsmType = receiver == null ? null : typeMapper.mapType(receiver.getType()); - Method method = JvmAbi.getSyntheticMethodSignatureForAnnotatedProperty(descriptor.getName(), receiverAsmType); + String name = JvmAbi.getSyntheticMethodNameForAnnotatedProperty(descriptor.getName()); + String desc = receiver == null ? "()V" : "(" + typeMapper.mapType(receiver.getType()) + ")V"; if (!isTrait(context.getContextDescriptor()) || kind == OwnerKind.TRAIT_IMPL) { - MethodVisitor mv = v.newMethod(null, - ACC_DEPRECATED | ACC_FINAL | ACC_PRIVATE | ACC_STATIC | ACC_SYNTHETIC, - method.getName(), - method.getDescriptor(), - null, - null); + int flags = ACC_DEPRECATED | ACC_FINAL | ACC_PRIVATE | ACC_STATIC | ACC_SYNTHETIC; + MethodVisitor mv = v.newMethod(null, flags, name, desc, null, null); AnnotationCodegen.forMethod(mv, typeMapper).genAnnotations(descriptor); mv.visitCode(); mv.visitInsn(Opcodes.RETURN); @@ -189,7 +185,7 @@ public class PropertyCodegen extends GenerationStateAware { } if (kind != OwnerKind.TRAIT_IMPL) { - v.getSerializationBindings().put(SYNTHETIC_METHOD_FOR_PROPERTY, descriptor, method); + v.getSerializationBindings().put(SYNTHETIC_METHOD_FOR_PROPERTY, descriptor, new Method(name, desc)); } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java index 590ba1d634b..40133d2f216 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java @@ -41,8 +41,7 @@ public class SyntheticMethodForAnnotatedPropertyGenTest extends CodegenTestCase return "properties/syntheticMethod"; } - private static final String TEST_SYNTHETIC_METHOD_NAME = - JvmAbi.getSyntheticMethodSignatureForAnnotatedProperty(Name.identifier("property"), null).getName(); + private static final String TEST_SYNTHETIC_METHOD_NAME = JvmAbi.getSyntheticMethodNameForAnnotatedProperty(Name.identifier("property")); public void testInClass() { loadFile(); diff --git a/compiler/util/util.iml b/compiler/util/util.iml index b50252e28ad..a7dcb0da6cd 100644 --- a/compiler/util/util.iml +++ b/compiler/util/util.iml @@ -7,7 +7,7 @@ - + diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java index 16f7f6d9920..6cee458bfd6 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java @@ -17,9 +17,6 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.asm4.Type; -import org.jetbrains.asm4.commons.Method; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; @@ -58,12 +55,8 @@ public final class JvmAbi { } @NotNull - public static Method getSyntheticMethodSignatureForAnnotatedProperty(@NotNull Name propertyName, @Nullable Type receiver) { - return new Method( - propertyName.asString() + ANNOTATED_PROPERTY_METHOD_NAME_SUFFIX, - Type.VOID_TYPE, - receiver == null ? new Type[0] : new Type[] {receiver} - ); + public static String getSyntheticMethodNameForAnnotatedProperty(@NotNull Name propertyName) { + return propertyName.asString() + ANNOTATED_PROPERTY_METHOD_NAME_SUFFIX; } @NotNull diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index 81252aec1ea..00446722f29 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -29,10 +29,8 @@ import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPropertyDescriptor import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl import java.util.Collections -import org.jetbrains.annotations.TestOnly import org.jetbrains.jet.lang.resolve.java.resolver.ExternalSignatureResolver import org.jetbrains.jet.lang.resolve.java.sam.SingleAbstractMethodUtils -import org.jetbrains.jet.utils.Printer import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPackageFragmentDescriptor import org.jetbrains.jet.lang.resolve.java.structure.JavaPropertyInitializerEvaluator import org.jetbrains.jet.utils.* @@ -349,7 +347,6 @@ public abstract class LazyJavaMemberScope( override fun toString() = "Lazy scope for ${getContainingDeclaration()}" - TestOnly override fun printScopeStructure(p: Printer) { p.println(javaClass.getSimpleName(), " {") p.pushIndent() diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt index 2bce5ea4712..1f3da087553 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt @@ -24,7 +24,6 @@ import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.* import org.jetbrains.jet.lang.resolve.java.resolver.* import org.jetbrains.jet.lang.types.Variance.* import org.jetbrains.jet.lang.types.* -import com.intellij.openapi.diagnostic.Logger import org.jetbrains.jet.lang.resolve.java.structure.JavaPrimitiveType import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifierType @@ -34,7 +33,6 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.kotlin.util.sure import org.jetbrains.jet.utils.* -import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaTypeParameterDescriptor import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner import org.jetbrains.jet.lang.resolve.java.lazy.* @@ -43,8 +41,6 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod import java.util.HashSet import org.jetbrains.jet.lang.types.checker.JetTypeChecker -private val LOG = Logger.getInstance(javaClass()) - class LazyJavaTypeResolver( private val c: LazyJavaResolverContext, private val typeParameterResolver: TypeParameterResolver @@ -248,10 +244,7 @@ class LazyJavaTypeResolver( } is JavaClass, null -> attr.howThisTypeIsUsed !in setOf(TYPE_ARGUMENT, SUPERTYPE_ARGUMENT, SUPERTYPE) - else -> { - LOG.error("Unknown classifier: ${classifier()}") - true - } + else -> error("Unknown classifier: ${classifier()}") } } override fun isNullable(): Boolean = _nullable() diff --git a/core/util.runtime/util.runtime.iml b/core/util.runtime/util.runtime.iml index 4815fceb3bf..41523570756 100644 --- a/core/util.runtime/util.runtime.iml +++ b/core/util.runtime/util.runtime.iml @@ -7,7 +7,6 @@ -