azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine generic signature for fields

Browse Source 
- For vals use the same semantics as for return types
- For vars use the same semantics as for value parameters
This commit is contained in:
Denis Zharkov
2015-11-27 18:57:00 +03:00
parent 64e0af48ed
commit 303c756302
7 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt
Vendored
+4 -4
View File
@@ -58,23 +58,23 @@ fun box(): String {
val classField3 = clz.getDeclaredField("classField3");
if (classField3.getGenericType().toString() != "Zout<? extends java.lang.String>")
if (classField3.getGenericType().toString() != "Zout<java.lang.String>")
return "fail3:" + classField3.getGenericType();
val classField4 = clz.getDeclaredField("classField4");
if (classField4.getGenericType().toString() != "Zin<? super TParam>")
if (classField4.getGenericType().toString() != "Zin<TParam>")
return "fail4:" + classField4.getGenericType();
val classField5 = clz.getDeclaredField("delegateLazy\$delegate");
if (classField5.getGenericType().toString() != "kotlin.Lazy<? extends Z<TParam>>")
if (classField5.getGenericType().toString() != "kotlin.Lazy<Z<TParam>>")
return "fail5:" + classField5.getGenericType();
val classField6 = clz.getDeclaredField("delegateNotNull\$delegate");
if (classField6.getGenericType().toString() != "kotlin.properties.ReadWriteProperty<? super java.lang.Object, Z<TParam>>")
if (classField6.getGenericType().toString() != "kotlin.properties.ReadWriteProperty<java.lang.Object, Z<TParam>>")
return "fail6:" + classField6.getGenericType();
compiler/testData/writeSignature/declarationSiteVariance/OutInField.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ public val mutList: MutableList<String> = throw Exception()
// field: OutInFieldKt::list
// jvm signature: Ljava/util/List;
// generic signature: Ljava/util/List<+Ljava/lang/String;>;
// generic signature: Ljava/util/List<Ljava/lang/String;>;
// field: OutInFieldKt::mutList
// jvm signature: Ljava/util/List;
compiler/testData/writeSignature/declarationSiteVariance/wildcardOptimization/fields.kt
Vendored
+25
View File
@@ -0,0 +1,25 @@
class Out<out T>
class Final
open class Open
@JvmField
val NO_WILDCARDS: Out<Open> = Out()
// field: FieldsKt::NO_WILDCARDS
// generic signature: LOut<LOpen;>;
@JvmField
var HAS_WILDCARDS: Out<Open> = Out()
// field: FieldsKt::HAS_WILDCARDS
// generic signature: LOut<+LOpen;>;
@JvmField
var NO_WILDCARDS_VAR: Out<Final> = Out()
// field: FieldsKt::NO_WILDCARDS_VAR
// generic signature: LOut<LFinal;>;
@JvmSuppressWildcards
@JvmField
var SUPPRESSED: Out<Open> = Out()
// field: FieldsKt::SUPPRESSED
// generic signature: LOut<LOpen;>;