Private constructors are now accessed via synthetic constructor with DEFAULT_CONSTRUCTOR_MARKER as an additional argument #KT-6299 Fixed

A set of tests provided. Some external tests fixed accordingly.
Companion object creation changed accordingly.
Derived classes now can use base class with the private constructor.
Refactoring of AccessorForFunctionDescriptor.
This commit is contained in:
Mikhail Glukhikh
2015-06-18 19:52:18 +03:00
parent 83ce674a37
commit 5fabb962ae
28 changed files with 393 additions and 68 deletions
@@ -0,0 +1,26 @@
// private constructors are transformed into synthetic
class PrivateConstructor private constructor() {
class Nested { val a = PrivateConstructor() }
}
fun check(klass: Class<*>) {
var hasSynthetic = false
var hasSimple = false
for (method in klass.getDeclaredConstructors()) {
if (method.isSynthetic()) {
hasSynthetic = true
}
else {
hasSimple = true
}
}
if (hasSynthetic && hasSimple) return
throw AssertionError("Class should have both synthetic and non-synthetic constructor: ($hasSynthetic, $hasSimple)")
}
fun box(): String {
check(javaClass<PrivateConstructor>())
// Also check that synthetic accessors really work
PrivateConstructor.Nested()
return "OK"
}