diff --git a/compiler/testData/writeSignature/ArrayOfCharSequence.kt b/compiler/testData/writeSignature/ArrayOfCharSequence.kt index 2ac7765dfe5..62497664b62 100644 --- a/compiler/testData/writeSignature/ArrayOfCharSequence.kt +++ b/compiler/testData/writeSignature/ArrayOfCharSequence.kt @@ -2,5 +2,4 @@ fun never(): Array = throw Exception() // method: _DefaultPackage::never // jvm signature: ()[Ljava/lang/CharSequence; -// generic signature: null -// kotlin signature: ()[Mjava/lang/CharSequence; // TODO: need to skip kotlin signature +// generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/ArrayOfInt.kt b/compiler/testData/writeSignature/ArrayOfInt.kt index 6401af29b7b..c899b70a36f 100644 --- a/compiler/testData/writeSignature/ArrayOfInt.kt +++ b/compiler/testData/writeSignature/ArrayOfInt.kt @@ -3,4 +3,3 @@ fun never(): Array = throw Exception() // method: _DefaultPackage::never // jvm signature: ()[Ljava/lang/Integer; // generic signature: null -// kotlin signature: ()[Ljet/Int; // TODO: need to skip kotlin signature diff --git a/compiler/testData/writeSignature/Comparable.kt b/compiler/testData/writeSignature/Comparable.kt index 653c70eb429..9273cbbb157 100644 --- a/compiler/testData/writeSignature/Comparable.kt +++ b/compiler/testData/writeSignature/Comparable.kt @@ -3,4 +3,3 @@ fun cc(): Comparable? = null // method: _DefaultPackage::cc // jvm signature: ()Ljava/lang/Comparable; // generic signature: ()Ljava/lang/Comparable; -// kotlin signature: ()?Ljava/lang/Comparable; diff --git a/compiler/testData/writeSignature/Int.kt b/compiler/testData/writeSignature/Int.kt index 668aa058899..bd2e3ccf3da 100644 --- a/compiler/testData/writeSignature/Int.kt +++ b/compiler/testData/writeSignature/Int.kt @@ -2,5 +2,4 @@ fun key(): Int = throw Exception() // method: _DefaultPackage::key // jvm signature: ()I -// generic signature: null -// kotlin signature: ()I // TODO: make null +// generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/IntArray.kt b/compiler/testData/writeSignature/IntArray.kt index 977055eb575..26248ad10f0 100644 --- a/compiler/testData/writeSignature/IntArray.kt +++ b/compiler/testData/writeSignature/IntArray.kt @@ -2,5 +2,4 @@ fun never(): IntArray = throw Exception() // method: _DefaultPackage::never // jvm signature: ()[I -// generic signature: null -// kotlin signature: ()[I // TODO: need to skip kotlin signature +// generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/IntQ.kt b/compiler/testData/writeSignature/IntQ.kt index 46cdeb9e148..fa1e1e7d586 100644 --- a/compiler/testData/writeSignature/IntQ.kt +++ b/compiler/testData/writeSignature/IntQ.kt @@ -2,5 +2,4 @@ fun sometimes(): Int? = null // method: _DefaultPackage::sometimes // jvm signature: ()Ljava/lang/Integer; -// generic signature: null -// kotlin signature: ()?Ljava/lang/Integer; // TODO: need to skip kotlin signature +// generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/ListOfCharSequence.kt b/compiler/testData/writeSignature/ListOfCharSequence.kt index 6ab20326c9b..da0f45f8c1c 100644 --- a/compiler/testData/writeSignature/ListOfCharSequence.kt +++ b/compiler/testData/writeSignature/ListOfCharSequence.kt @@ -3,5 +3,4 @@ fun foo(p: List) = 1 // method: _DefaultPackage::foo // jvm signature: (Ljava/util/List;)I -// generic signature: (Ljava/util/List<+Ljava/lang/CharSequence;>;)I -// kotlin signature: (Ljet/List;)I // TODO: skip Kotlin signature +// generic signature: (Ljava/util/List<+Ljava/lang/CharSequence;>;)I \ No newline at end of file diff --git a/compiler/testData/writeSignature/ListOfStar.kt b/compiler/testData/writeSignature/ListOfStar.kt index a13f6e6e7fd..bf83b0c98be 100644 --- a/compiler/testData/writeSignature/ListOfStar.kt +++ b/compiler/testData/writeSignature/ListOfStar.kt @@ -3,5 +3,4 @@ fun listOfStar(): List<*> = throw Exception() // method: _DefaultPackage::listOfStar // jvm signature: ()Ljava/util/List; -// generic signature: ()Ljava/util/List; -// kotlin signature: ()Ljet/List; +// generic signature: ()Ljava/util/List; \ No newline at end of file diff --git a/compiler/testData/writeSignature/MapEntry.kt b/compiler/testData/writeSignature/MapEntry.kt index 8f935caf5c0..d0202893a3f 100644 --- a/compiler/testData/writeSignature/MapEntry.kt +++ b/compiler/testData/writeSignature/MapEntry.kt @@ -2,5 +2,4 @@ fun getEntry(): jet.Map.Entry? = null // method: _DefaultPackage::getEntry // jvm signature: ()Ljava/util/Map$Entry; -// generic signature: ()Ljava/util/Map$Entry; -// kotlin signature: ()?Ljet/Map.Entry; +// generic signature: ()Ljava/util/Map$Entry; \ No newline at end of file diff --git a/compiler/testData/writeSignature/MutableMapEntry.kt b/compiler/testData/writeSignature/MutableMapEntry.kt index b7128c313c0..5afa2297246 100644 --- a/compiler/testData/writeSignature/MutableMapEntry.kt +++ b/compiler/testData/writeSignature/MutableMapEntry.kt @@ -2,5 +2,4 @@ fun getEntry(): jet.MutableMap.MutableEntry? = null // method: _DefaultPackage::getEntry // jvm signature: ()Ljava/util/Map$Entry; -// generic signature: ()Ljava/util/Map$Entry; -// kotlin signature: ()?Ljet/MutableMap.MutableEntry; +// generic signature: ()Ljava/util/Map$Entry; \ No newline at end of file diff --git a/compiler/testData/writeSignature/NonGeneric.kt b/compiler/testData/writeSignature/NonGeneric.kt index 354dde8495b..d01036fbfdd 100644 --- a/compiler/testData/writeSignature/NonGeneric.kt +++ b/compiler/testData/writeSignature/NonGeneric.kt @@ -2,5 +2,4 @@ fun foo() = 1 // method: _DefaultPackage::foo // jvm signature: ()I -// generic signature: null -// kotlin signature: ()I // TODO: need to skip kotlin signature +// generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/Nothing.kt b/compiler/testData/writeSignature/Nothing.kt index dcd77e541f7..df2b18e8942 100644 --- a/compiler/testData/writeSignature/Nothing.kt +++ b/compiler/testData/writeSignature/Nothing.kt @@ -2,5 +2,4 @@ fun nothing(): Nothing = throw Exception() // method: _DefaultPackage::nothing // jvm signature: ()V -// generic signature: null -// kotlin signature: ()Ljet/Nothing; +// generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/NothingQ.kt b/compiler/testData/writeSignature/NothingQ.kt index bcd06c3e2e4..ad9097f54e9 100644 --- a/compiler/testData/writeSignature/NothingQ.kt +++ b/compiler/testData/writeSignature/NothingQ.kt @@ -2,5 +2,4 @@ fun nothingq(): Nothing? = null // method: _DefaultPackage::nothingq // jvm signature: ()Ljava/lang/Object; -// generic signature: null -// kotlin signature: ()?Ljet/Nothing; +// generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/VarargCharSequence.kt b/compiler/testData/writeSignature/VarargCharSequence.kt index 4213e4da4cc..2a8a03f2055 100644 --- a/compiler/testData/writeSignature/VarargCharSequence.kt +++ b/compiler/testData/writeSignature/VarargCharSequence.kt @@ -2,5 +2,4 @@ fun foo(vararg tail: java.lang.CharSequence) = 1 // method: _DefaultPackage::foo // jvm signature: ([Ljava/lang/CharSequence;)I -// generic signature: null -// kotlin signature: ([Mjava/lang/CharSequence;)I // TODO: need to skip kotlin signature +// generic signature: null \ No newline at end of file diff --git a/compiler/testData/writeSignature/VarargGeneric.kt b/compiler/testData/writeSignature/VarargGeneric.kt index 325795e5ffb..3e1ae98b51c 100644 --- a/compiler/testData/writeSignature/VarargGeneric.kt +++ b/compiler/testData/writeSignature/VarargGeneric.kt @@ -2,7 +2,4 @@ fun

foo(vararg tail: P) = 1 // method: _DefaultPackage::foo // jvm signature: ([Ljava/lang/Object;)I -// generic signature: ([TP;)I -// kotlin signature: ([TP;)I -// TODO: skip kotlin signature -// TODO: properly serialize typeinfo +// generic signature: ([TP;)I \ No newline at end of file diff --git a/compiler/testData/writeSignature/constructor/Constructor0.kt b/compiler/testData/writeSignature/constructor/Constructor0.kt index 13eaaa75106..62917ee35ce 100644 --- a/compiler/testData/writeSignature/constructor/Constructor0.kt +++ b/compiler/testData/writeSignature/constructor/Constructor0.kt @@ -3,4 +3,3 @@ class Constructor0() // method: Constructor0:: // jvm signature: ()V // generic signature: null -// kotlin signature: null diff --git a/compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt b/compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt index ae56611f1d4..b2c95535483 100644 --- a/compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt +++ b/compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt @@ -4,4 +4,3 @@ class TestingKotlinCollections(val arguments: Collection) // method: TestingKotlinCollections:: // jvm signature: (Ljava/util/Collection;)V // generic signature: (Ljava/util/Collection<+Ljava/lang/String;>;)V -// kotlin signature: (Ljet/Collection;)null diff --git a/compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt b/compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt index 354263576a3..03b2f3cf388 100644 --- a/compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt +++ b/compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt @@ -3,4 +3,3 @@ class ConstructorWithTypeParameter

() // method: ConstructorWithTypeParameter:: // jvm signature: ()V // generic signature: null -// kotlin signature: null diff --git a/compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt b/compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt index c49d4398d39..75cfcd63345 100644 --- a/compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt +++ b/compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt @@ -3,4 +3,3 @@ class ConstructorWithTypeParameter

(p: P) // method: ConstructorWithTypeParameter:: // jvm signature: (Ljava/lang/Object;)V // generic signature: (TP;)V -// kotlin signature: (TP;)null diff --git a/compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt b/compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt index 13f9ab8d7a3..98e5916b5a2 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt @@ -6,5 +6,4 @@ fun f(m: M): M = throw Exception() // method: _DefaultPackage::f // jvm signature: (LM;)LM; -// generic signature: (LM<-LX;+LX;>;)LM; -// kotlin signature: (LM;)LM; +// generic signature: (LM<-LX;+LX;>;)LM; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt index 88136cf30a1..d961443b37b 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt @@ -4,5 +4,4 @@ fun f(p: In) {} // method: _DefaultPackage::f // jvm signature: (LIn;)V -// generic signature: (LIn<-Ljava/lang/String;>;)V -// kotlin signature: (LIn;)V +// generic signature: (LIn<-Ljava/lang/String;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt index 52c7afb0421..2e5a8e18e81 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt @@ -4,5 +4,4 @@ fun f(): In = throw Exception() // method: _DefaultPackage::f // jvm signature: ()LIn; -// generic signature: ()LIn; -// kotlin signature: ()LIn; +// generic signature: ()LIn; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt index c46e4311c96..240a961fd55 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt @@ -5,5 +5,4 @@ fun f(p: In>) {} // method: _DefaultPackage::f // jvm signature: (LIn;)V -// generic signature: (LIn<-LIn<-LX;>;>;)V -// kotlin signature: (LIn;>;)V +// generic signature: (LIn<-LIn<-LX;>;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt index 82c1113452a..2116a1be139 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt @@ -5,5 +5,4 @@ fun f(): In> = throw Exception() // method: _DefaultPackage::f // jvm signature: ()LIn; -// generic signature: ()LIn;>; -// kotlin signature: ()LIn;>; +// generic signature: ()LIn;>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt index 345de1f7be1..e601a8eb527 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt @@ -6,5 +6,4 @@ fun f(p: In>) {} // method: _DefaultPackage::f // jvm signature: (LIn;)V -// generic signature: (LIn<-LOut<+LX;>;>;)V -// kotlin signature: (LIn;>;)V +// generic signature: (LIn<-LOut<+LX;>;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt index c19d6340436..e57d6a3030f 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt @@ -6,5 +6,4 @@ fun f(): In> = throw Exception() // method: _DefaultPackage::f // jvm signature: ()LIn; -// generic signature: ()LIn;>; -// kotlin signature: ()LIn;>; +// generic signature: ()LIn;>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt index b10bc1320a1..bdfccd70cfe 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt @@ -2,5 +2,4 @@ fun f(p: List) {} // method: _DefaultPackage::f // jvm signature: (Ljava/util/List;)V -// generic signature: (Ljava/util/List<+Ljava/lang/String;>;)V -// kotlin signature: (Ljet/List;)V +// generic signature: (Ljava/util/List<+Ljava/lang/String;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt index 48dbfe2fc7a..9a00fab8f2b 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt @@ -2,5 +2,4 @@ fun f(): List = throw Exception() // method: _DefaultPackage::f // jvm signature: ()Ljava/util/List; -// generic signature: ()Ljava/util/List; -// kotlin signature: ()Ljet/List; +// generic signature: ()Ljava/util/List; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt index c1dd6397240..99de791ea84 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt @@ -6,5 +6,4 @@ fun f(p: Out>) {} // method: _DefaultPackage::f // jvm signature: (LOut;)V -// generic signature: (LOut<+LIn<-LX;>;>;)V -// kotlin signature: (LOut;>;)V +// generic signature: (LOut<+LIn<-LX;>;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt index ce95b2a8d25..4da1ff13852 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt @@ -6,5 +6,4 @@ fun f(): Out> = throw Exception() // method: _DefaultPackage::f // jvm signature: ()LOut; -// generic signature: ()LOut;>; -// kotlin signature: ()LOut;>; +// generic signature: ()LOut;>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt index 37ad7699b9d..1ef505b10dc 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt @@ -5,5 +5,4 @@ fun f(p: Out>) {} // method: _DefaultPackage::f // jvm signature: (LOut;)V -// generic signature: (LOut<+LOut<+LX;>;>;)V -// kotlin signature: (LOut;>;)V +// generic signature: (LOut<+LOut<+LX;>;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt b/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt index c09e52a3c02..98715bab84e 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt @@ -15,5 +15,4 @@ fun f(): Out> = throw Exception() // method: _DefaultPackage::f // jvm signature: ()LOut; -// generic signature: ()LOut;>; -// kotlin signature: ()LOut;>; +// generic signature: ()LOut;>; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt index 6327658fdb3..37a9047544d 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt @@ -5,5 +5,4 @@ val p: M = throw Exception() // method: _DefaultPackage::getP // jvm signature: ()LM; -// generic signature: ()LM; -// kotlin signature: null \ No newline at end of file +// generic signature: ()LM; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt index 147247e86c0..078bada95cc 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt @@ -5,5 +5,4 @@ val p: M = throw Exception() // method: _DefaultPackage::getP // jvm signature: ()LM; -// generic signature: ()LM; -// kotlin signature: null +// generic signature: ()LM; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt index c331e32e282..b979f4def79 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt @@ -5,5 +5,4 @@ val p: M = throw Exception() // method: _DefaultPackage::getP // jvm signature: ()LM; -// generic signature: ()LM; -// kotlin signature: null +// generic signature: ()LM; \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt index 974ce4969c1..aac08a65b25 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt @@ -5,5 +5,4 @@ var p: M = throw Exception() // method: _DefaultPackage::setP // jvm signature: (LM;)V -// generic signature: (LM<-LX;>;)V -// kotlin signature: (LM;)null \ No newline at end of file +// generic signature: (LM<-LX;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt b/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt index b31e57fbc88..d72140ad4fd 100644 --- a/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt +++ b/compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt @@ -5,5 +5,4 @@ var p: M = throw Exception() // method: _DefaultPackage::setP // jvm signature: (LM;)V -// generic signature: (LM<+LX;>;)V -// kotlin signature: (LM;)null +// generic signature: (LM<+LX;>;)V \ No newline at end of file diff --git a/compiler/testData/writeSignature/jlString.kt b/compiler/testData/writeSignature/jlString.kt index 367e71408da..7ec8e761734 100644 --- a/compiler/testData/writeSignature/jlString.kt +++ b/compiler/testData/writeSignature/jlString.kt @@ -2,5 +2,4 @@ fun string(): java.lang.String = throw Exception() // method: _DefaultPackage::string // jvm signature: ()Ljava/lang/String; -// generic signature: null -// kotlin signature: ()Mjava/lang/String; +// generic signature: null \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java index df8e6b67fd1..0493f3a2438 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java @@ -24,7 +24,6 @@ import junit.framework.Test; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.asm4.*; -import org.jetbrains.asm4.commons.Method; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; @@ -32,7 +31,6 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.junit.Assert; @@ -51,8 +49,6 @@ import java.util.regex.Pattern; */ public class WriteSignatureTest extends TestCaseWithTmpdir { - private static final AnnotationVisitor EMPTY_ANNOTATION_VISITOR = new AnnotationVisitor(Opcodes.ASM4) {}; - private final File ktFile; private JetCoreEnvironment jetCoreEnvironment; @@ -96,27 +92,24 @@ public class WriteSignatureTest extends TestCaseWithTmpdir { String template = "jvm signature: %s\n" + "generic signature: %s\n" + - "kotlin signature: %s\n" + ""; - String expected = String.format(template, expectation.jvmSignature, expectation.genericSignature, expectation.kotlinSignature); - String actual = String.format(template, actualSignature.jvmSignature, actualSignature.genericSignature, actualSignature.kotlinSignature); + String expected = String.format(template, expectation.jvmSignature, expectation.genericSignature); + String actual = String.format(template, actualSignature.jvmSignature, actualSignature.genericSignature); Assert.assertEquals(expected, actual); } - + private static class ActualSignature { private final String jvmSignature; private final String genericSignature; - private final String kotlinSignature; - private ActualSignature(@NotNull String jvmSignature, @Nullable String genericSignature, @Nullable String kotlinSignature) { + private ActualSignature(@NotNull String jvmSignature, @Nullable String genericSignature) { this.jvmSignature = jvmSignature; this.genericSignature = genericSignature; - this.kotlinSignature = kotlinSignature; } } - + @NotNull private ActualSignature readSignature(String className, final String methodName) throws Exception { // ugly unreadable code begin @@ -133,143 +126,47 @@ public class WriteSignatureTest extends TestCaseWithTmpdir { public MethodVisitor visitMethod(int access, String name, final String desc, final String signature, String[] exceptions) { if (name.equals(methodName)) { - final int parameterCount = new Method(name, desc).getArgumentTypes().length; - return new MethodVisitor(Opcodes.ASM4) { - String typeParameters = ""; - String returnType; - String[] parameterTypes = new String[parameterCount]; - - @Override - public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - if (desc.equals(JvmStdlibNames.JET_METHOD.getDescriptor())) { - return new AnnotationVisitor(Opcodes.ASM4) { - @Override - public void visit(String name, Object value) { - if (name.equals(JvmStdlibNames.JET_METHOD_TYPE_PARAMETERS_FIELD)) { - typeParameters = (String) value; - } - else if (name.equals(JvmStdlibNames.JET_METHOD_RETURN_TYPE_FIELD)) { - returnType = (String) value; - } - } - - @Override - public AnnotationVisitor visitAnnotation(String s, String s1) { - return EMPTY_ANNOTATION_VISITOR; - } - - @Override - public AnnotationVisitor visitArray(String name) { - return EMPTY_ANNOTATION_VISITOR; - } - }; - } - else { - return EMPTY_ANNOTATION_VISITOR; - } - } - - @Override - public AnnotationVisitor visitParameterAnnotation(final int parameter, String desc, boolean visible) { - if (desc.equals(JvmStdlibNames.JET_VALUE_PARAMETER.getDescriptor())) { - return new AnnotationVisitor(Opcodes.ASM4) { - @Override - public void visit(String name, Object value) { - if (name.equals(JvmStdlibNames.JET_VALUE_PARAMETER_TYPE_FIELD)) { - parameterTypes[parameter] = (String) value; - } - } - - @Override - public AnnotationVisitor visitAnnotation(String name, String desc) { - return EMPTY_ANNOTATION_VISITOR; - } - - @Override - public AnnotationVisitor visitArray(String name) { - return EMPTY_ANNOTATION_VISITOR; - } - }; - } - else { - return EMPTY_ANNOTATION_VISITOR; - } - } - - @Override - public AnnotationVisitor visitAnnotationDefault() { - return EMPTY_ANNOTATION_VISITOR; - } - - @Nullable - private String makeKotlinSignature() { - boolean allNulls = true; - - StringBuilder sb = new StringBuilder(); - sb.append(typeParameters); - if (typeParameters != null && typeParameters.length() > 0) { - allNulls = false; - } - sb.append("("); - for (String parameterType : parameterTypes) { - sb.append(parameterType); - if (parameterType != null) { - allNulls = false; - } - } - sb.append(")"); - sb.append(returnType); - if (returnType != null) { - allNulls = false; - } - if (allNulls) { - return null; - } - else { - return sb.toString(); - } - } - @Override public void visitEnd() { Assert.assertNull(readSignature); - readSignature = new ActualSignature(desc, signature, makeKotlinSignature()); + readSignature = new ActualSignature(desc, signature); } }; } return super.visitMethod(access, name, desc, signature, exceptions); } } - + Visitor visitor = new Visitor(); - + new ClassReader(classInputStream).accept(visitor, - ClassReader.SKIP_CODE|ClassReader.SKIP_DEBUG|ClassReader.SKIP_FRAMES); - + ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES); + Assert.assertNotNull("method not found: " + className + "::" + methodName, visitor.readSignature); return visitor.readSignature; - } finally { + } + finally { Closeables.closeQuietly(classInputStream); } // ugly unreadable code end } - + private static class Expectation { private final String className; private final String methodName; private final String jvmSignature; private final String genericSignature; - private final String kotlinSignature; - private Expectation(@NotNull String className, @NotNull String methodName, - @NotNull String jvmSignature, @Nullable String genericSignature, @Nullable String kotlinSignature) { + private Expectation( + @NotNull String className, @NotNull String methodName, + @NotNull String jvmSignature, @Nullable String genericSignature + ) { this.className = className; this.methodName = methodName; this.jvmSignature = jvmSignature; this.genericSignature = genericSignature; - this.kotlinSignature = kotlinSignature; } } @@ -277,46 +174,44 @@ public class WriteSignatureTest extends TestCaseWithTmpdir { private static final Pattern methodPattern = Pattern.compile("^// method: *(.*)::(.*?) *(//.*)?"); private static final Pattern jvmSignaturePattern = Pattern.compile("^// jvm signature: *(.+?) *(//.*)?"); private static final Pattern genericSignaturePattern = Pattern.compile("^// generic signature: *(.+?) *(//.*)?"); - private static final Pattern kotlinSignaturePattern = Pattern.compile("^// kotlin signature: *(.+?) *(//.*)?"); + private Expectation parseExpectations() throws IOException { List lines = Files.readLines(ktFile, Charset.forName("utf-8")); - for (int i = 0; i < lines.size() - 3; ++i) { + for (int i = 0; i < lines.size() - 2; ++i) { Matcher methodMatcher = methodPattern.matcher(lines.get(i)); if (methodMatcher.matches()) { Matcher jvmSignatureMatcher = jvmSignaturePattern.matcher(lines.get(i + 1)); Matcher genericSignatureMatcher = genericSignaturePattern.matcher(lines.get(i + 2)); - Matcher kotlinSignatureMatcher = kotlinSignaturePattern.matcher(lines.get(i + 3)); - if (!jvmSignatureMatcher.matches() || !genericSignatureMatcher.matches() || !kotlinSignatureMatcher.matches()) { + if (!jvmSignatureMatcher.matches() || !genericSignatureMatcher.matches()) { throw new AssertionError("'method:' must be followed ... bla bla ... use the source luke"); } - + String className = methodMatcher.group(1); String methodName = methodMatcher.group(2); - + String jvmSignature = jvmSignatureMatcher.group(1); String genericSignature = genericSignatureMatcher.group(1); - String kotlinSignature = kotlinSignatureMatcher.group(1); if (genericSignature.equals("null")) { genericSignature = null; } - if (kotlinSignature.equals("null")) { - kotlinSignature = null; - } - return new Expectation(className, methodName, jvmSignature, genericSignature, kotlinSignature); + return new Expectation(className, methodName, jvmSignature, genericSignature); } } throw new AssertionError("test instructions not found in " + ktFile); } public static Test suite() { - return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/writeSignature", true, new JetTestCaseBuilder.NamedTestFactory() { - @NotNull - @Override - public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) { - return new WriteSignatureTest(file); - } - }); - + return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/writeSignature", true, + new JetTestCaseBuilder.NamedTestFactory() { + @NotNull + @Override + public Test createTest( + @NotNull String dataPath, + @NotNull String name, + @NotNull File file + ) { + return new WriteSignatureTest(file); + } + }); } - }