KT-7922 Added Boolean Companion Object

compiler/testData/codegen/box/reflection/classes/nestedClasses.kt

@@ -48,15 +48,14 @@ fun box(): String {
     assertEquals(listOf("Entry"), nestedNames(MutableMap::class))
 
     // Primitives
-    for (primitive in listOf(Byte::class, Double::class, Float::class, Int::class, Long::class, Short::class, Char::class)) {
+    for (primitive in listOf(Byte::class, Double::class, Float::class, Int::class, Long::class, Short::class, Char::class, Boolean::class)) {
         assertEquals(listOf("Companion"), nestedNames(primitive))
     }
-    assertEquals(emptyList<String>(), nestedNames(Boolean::class))
 
     // Primitive arrays
     for (primitiveArray in listOf(
-            ByteArray::class, DoubleArray::class, FloatArray::class, IntArray::class,
-            LongArray::class, ShortArray::class, CharArray::class, BooleanArray::class
+        ByteArray::class, DoubleArray::class, FloatArray::class, IntArray::class,
+        LongArray::class, ShortArray::class, CharArray::class, BooleanArray::class
     )) {
         assertEquals(emptyList<String>(), nestedNames(primitiveArray))
     }

compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.java

@@ -6,5 +6,6 @@ public interface IntrinsicCompanionObject {
     void testInt(IntCompanionObject i);
     void testChar(CharCompanionObject c);
     void testString(StringCompanionObject s);
+    void testBoolean(BooleanCompanionObject b);
     void testEnum(EnumCompanionObject e);
 }

compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.txt

@@ -1,6 +1,7 @@
 package test
 
 public interface IntrinsicCompanionObject {
+    public abstract fun testBoolean(/*0*/ p0: kotlin.Boolean.Companion!): kotlin.Unit
     public abstract fun testChar(/*0*/ p0: kotlin.Char.Companion!): kotlin.Unit
     public abstract fun testEnum(/*0*/ p0: kotlin.Enum.Companion!): kotlin.Unit
     public abstract fun testInt(/*0*/ p0: kotlin.Int.Companion!): kotlin.Unit

core/builtins/native/kotlin/Boolean.kt

@@ -21,6 +21,8 @@ package kotlin
  * represented as values of the primitive type `boolean`.
  */
 public class Boolean private constructor() : Comparable<Boolean> {
+    companion object {}
+
     /**
      * Returns the inverse of this boolean.
      */

core/descriptors/src/org/jetbrains/kotlin/builtins/CompanionObjectMapping.kt

@@ -24,13 +24,14 @@ import java.util.*
 
 object CompanionObjectMapping {
     private val classIds =
-            (PrimitiveType.NUMBER_TYPES.map(KotlinBuiltIns::getPrimitiveFqName) +
-             KotlinBuiltIns.FQ_NAMES.string.toSafe() +
-             KotlinBuiltIns.FQ_NAMES._enum.toSafe()).mapTo(linkedSetOf<ClassId>(), ClassId::topLevel)
+        (PrimitiveType.NUMBER_TYPES.map(KotlinBuiltIns::getPrimitiveFqName) +
+                KotlinBuiltIns.FQ_NAMES.string.toSafe() +
+                KotlinBuiltIns.FQ_NAMES._boolean.toSafe() +
+                KotlinBuiltIns.FQ_NAMES._enum.toSafe()).mapTo(linkedSetOf<ClassId>(), ClassId::topLevel)
 
     fun allClassesWithIntrinsicCompanions(): Set<ClassId> =
-            Collections.unmodifiableSet(classIds)
+        Collections.unmodifiableSet(classIds)
 
     fun isMappedIntrinsicCompanionObject(classDescriptor: ClassDescriptor): Boolean =
-            DescriptorUtils.isCompanionObject(classDescriptor) && classDescriptor.classId?.outerClassId in classIds
+        DescriptorUtils.isCompanionObject(classDescriptor) && classDescriptor.classId?.outerClassId in classIds
 }

core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/ClassMapperLite.kt

@@ -63,7 +63,7 @@ object ClassMapperLite {
             add("reflect/KFunction$i", "kotlin/reflect/KFunction")
         }
 
-        for (klass in listOf("Char", "Byte", "Short", "Int", "Float", "Long", "Double", "String", "Enum")) {
+        for (klass in listOf("Char", "Byte", "Short", "Int", "Float", "Long", "Double", "String", "Enum", "Boolean")) {
             add("$klass.Companion", "kotlin/jvm/internal/${klass}CompanionObject")
         }
     }

libraries/stdlib/js/runtime/primitiveCompanionObjects.kt

@@ -100,3 +100,5 @@ private object CharCompanionObject {
 
 private object StringCompanionObject {}
 
+private object BooleanCompanionObject {}
+

libraries/stdlib/jvm/runtime/kotlin/jvm/internal/PrimitiveCompanionObjects.kt

@@ -52,4 +52,5 @@ internal object CharCompanionObject {
 }
 
 internal object StringCompanionObject {}
-internal object EnumCompanionObject {}
+internal object EnumCompanionObject {}
+internal object BooleanCompanionObject {}

libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt

@@ -365,6 +365,10 @@ public final class kotlin/jvm/internal/ArrayIteratorsKt {
 	public static final fun iterator ([Z)Lkotlin/collections/BooleanIterator;
 }
 
+public final class kotlin/jvm/internal/BooleanCompanionObject {
+	public static final field INSTANCE Lkotlin/jvm/internal/BooleanCompanionObject;
+}
+
 public final class kotlin/jvm/internal/BooleanSpreadBuilder : kotlin/jvm/internal/PrimitiveSpreadBuilder {
 	public fun <init> (I)V
 	public final fun add (Z)V

libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt

@@ -3179,6 +3179,10 @@ public final class kotlin/jvm/internal/ArrayIteratorsKt {
 	public static final fun iterator ([Z)Lkotlin/collections/BooleanIterator;
 }
 
+public final class kotlin/jvm/internal/BooleanCompanionObject {
+	public static final field INSTANCE Lkotlin/jvm/internal/BooleanCompanionObject;
+}
+
 public final class kotlin/jvm/internal/BooleanSpreadBuilder : kotlin/jvm/internal/PrimitiveSpreadBuilder {
 	public fun <init> (I)V
 	public final fun add (Z)V