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

KT-11645 properly handle private property getter name mangling in reflection

Browse Source
This commit is contained in:
Dmitry Petrov
2016-04-13 15:59:42 +03:00
parent 511a7e0072
commit 583733be8d
5 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/reflection/multifileClasses/javaFieldForVarAndConstVal.kt
Vendored
+20
View File
@@ -36,9 +36,26 @@ fun testY() {
assertEquals("I am const y", field.get(null))
}
fun testZ() {
val field = refZ.javaField ?: throw AssertionError("No java field for ${refZ.name}")
try {
field.get(null)
throw AssertionError("IllegalAccessError expected")
}
catch (e: IllegalAccessException) {
// OK
}
field.setAccessible(true)
assertEquals("I am private const val Z", field.get(null))
}
fun box(): String {
testX()
testY()
testZ()
return x
}
@@ -50,3 +67,6 @@ package test
var x = "I am x"
const val y = "I am const y"
private const val z = "I am private const val Z"
val refZ = ::z
compiler/testData/codegen/bytecodeListing/emptyMultifileFacade.txt
Vendored
+1 -1
View File
@@ -3,5 +3,5 @@ public final class test/Foo
@kotlin.Metadata
synthetic final class test/Foo__EmptyMultifileFacadeKt {
private final static method privateOnly$emptyMultifileFacade_kt(): void
private final static method privateOnly$Foo__EmptyMultifileFacadeKt(): void
}
compiler/testData/codegen/dumpDeclarations/multifileFacadeMembers.json
Vendored
+5 -4
View File
@@ -14,10 +14,10 @@
{"visibility": "internal", "declaration": "fun <get-internalVar>(): kotlin.Long", "name": "getInternalVar", "desc": "()J"},
{"visibility": "internal", "declaration": "fun <set-internalVar>(<set-?>: kotlin.Long): kotlin.Unit", "name": "setInternalVar", "desc": "(J)V"},
{"visibility": "private", "declaration": "val privateVal: kotlin.Any?", "name": "privateVal", "desc": "Ljava/lang/Object;"},
{"visibility": "private", "declaration": "fun <get-privateVal>(): kotlin.Any?", "name": "getPrivateVal$Part1_kt", "desc": "()Ljava/lang/Object;"},
{"visibility": "private", "declaration": "fun <get-privateVal>(): kotlin.Any?", "name": "getPrivateVal$MultifileFacade__Part1Kt", "desc": "()Ljava/lang/Object;"},
{"visibility": "private", "declaration": "var privateVar: kotlin.Any?", "name": "privateVar", "desc": "Ljava/lang/Object;"},
{"visibility": "private", "declaration": "fun <get-privateVar>(): kotlin.Any?", "name": "getPrivateVar$Part1_kt", "desc": "()Ljava/lang/Object;"},
{"visibility": "private", "declaration": "fun <set-privateVar>(<set-?>: kotlin.Any?): kotlin.Unit", "name": "setPrivateVar$Part1_kt", "desc": "(Ljava/lang/Object;)V"},
{"visibility": "private", "declaration": "fun <get-privateVar>(): kotlin.Any?", "name": "getPrivateVar$MultifileFacade__Part1Kt", "desc": "()Ljava/lang/Object;"},
{"visibility": "private", "declaration": "fun <set-privateVar>(<set-?>: kotlin.Any?): kotlin.Unit", "name": "setPrivateVar$MultifileFacade__Part1Kt", "desc": "(Ljava/lang/Object;)V"},
{"declaration": "package-fragment ", "name": "<clinit>", "desc": "()V"}
]
},
@@ -34,9 +34,10 @@
"declaration": "package-fragment ",
"class": "MultifileFacade__Part2Kt",
"members": [
{"visibility": "private", "declaration": "const val privateConst: kotlin.Int", "name": "privateConst", "desc": "I"},
{"visibility": "public", "declaration": "fun publicFun(): kotlin.Unit", "name": "publicFun", "desc": "()V"},
{"visibility": "internal", "declaration": "fun internalFun(param1: kotlin.Int): kotlin.Unit", "name": "internalFun", "desc": "(I)V"},
{"visibility": "private", "declaration": "fun privateFun(x: kotlin.Any): kotlin.Unit", "name": "privateFun$Part2_kt", "desc": "(Ljava/lang/Object;)V"},
{"visibility": "private", "declaration": "fun privateFun(x: kotlin.Any): kotlin.Unit", "name": "privateFun$MultifileFacade__Part2Kt", "desc": "(Ljava/lang/Object;)V"},
{"visibility": "private", "declaration": "fun privateFun(x: kotlin.Any): kotlin.Unit", "name": "access$privateFun", "desc": "(Ljava/lang/Object;)V"},
{"visibility": "private", "declaration": "fun <get-privateConst>(): kotlin.Int", "name": "access$getPrivateConst$p", "desc": "()I"}
]