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

Fix NPE on .companionObjectInstance for built-in classes

Browse Source 
#KT-13370 Fixed
This commit is contained in:
Alexander Udalov
2016-08-08 18:29:03 +03:00
parent 611899e9d3
commit 3efa738bc0
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/reflection/classes/companionObject.kt
Vendored
+19
View File
@@ -25,5 +25,24 @@ fun box(): String {
assertEquals(E.Companion, E::class.companionObjectInstance)
assertEquals(String, String::class.companionObjectInstance)
assertEquals(String, String.Companion::class.objectInstance)
assertEquals(Enum, Enum::class.companionObjectInstance)
assertEquals(Enum, Enum.Companion::class.objectInstance)
assertEquals(Double, Double::class.companionObjectInstance)
assertEquals(Double, Double.Companion::class.objectInstance)
assertEquals(Float, Float::class.companionObjectInstance)
assertEquals(Float, Float.Companion::class.objectInstance)
assertEquals(Int, Int::class.companionObjectInstance)
assertEquals(Int, Int.Companion::class.objectInstance)
assertEquals(Long, Long::class.companionObjectInstance)
assertEquals(Long, Long.Companion::class.objectInstance)
assertEquals(Short, Short::class.companionObjectInstance)
assertEquals(Short, Short.Companion::class.objectInstance)
assertEquals(Byte, Byte::class.companionObjectInstance)
assertEquals(Byte, Byte.Companion::class.objectInstance)
assertEquals(Char, Char::class.companionObjectInstance)
assertEquals(Char, Char.Companion::class.objectInstance)
return "OK"
}
compiler/testData/codegen/box/reflection/classes/objectInstance.kt
Vendored
+2
View File
@@ -26,6 +26,8 @@ fun box(): String {
assertEquals(3, B.Factory::class.objectInstance!!.foo())
assertEquals(null, C::class.objectInstance)
assertEquals(null, String::class.objectInstance)
assertEquals(Unit, Unit::class.objectInstance)
return "OK"
}