[Serialization] Use new DSL for generating declarations

plugins/kotlinx-serialization/testData/firMembers/abstractAndSealed.fir.txt

@@ -3,7 +3,9 @@ FILE: abstractAndSealed.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<I>|
 
-            private constructor(): R|I.Companion|
+            private constructor(): R|I.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -24,7 +26,9 @@ FILE: abstractAndSealed.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<X>|
 
-            private constructor(): R|X.Companion|
+            private constructor(): R|X.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -45,7 +49,9 @@ FILE: abstractAndSealed.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Y>|
 
-            private constructor(): R|Y.Companion|
+            private constructor(): R|Y.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -58,7 +64,9 @@ FILE: abstractAndSealed.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Bottom>|
 
-            private constructor(): R|Bottom.Companion|
+            private constructor(): R|Bottom.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -72,7 +80,9 @@ FILE: abstractAndSealed.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Bottom.$serializer|
+            private constructor(): R|Bottom.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/classWithCompanionObject.fir.txt

@@ -10,7 +10,9 @@ FILE: classWithCompanionObject.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<SomeClass>|
 
-            private constructor(): R|SomeClass.Companion|
+            private constructor(): R|SomeClass.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -24,7 +26,9 @@ FILE: classWithCompanionObject.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|SomeClass.$serializer|
+            private constructor(): R|SomeClass.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/classWithGenericParameters.fir.txt

@@ -16,7 +16,9 @@ FILE: classWithGenericParameters.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun <T, V> serializer(typeSerial0: R|kotlinx/serialization/KSerializer<T>|, typeSerial1: R|kotlinx/serialization/KSerializer<V>|): R|kotlinx/serialization/KSerializer<GenericBox<T, V>>|
 
-            private constructor(): R|GenericBox.Companion|
+            private constructor(): R|GenericBox.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -32,9 +34,11 @@ FILE: classWithGenericParameters.kt
 
             public final fun typeParametersSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|GenericBox.$serializer<T, V>|
+            private constructor<T, V>(): R|GenericBox.$serializer<T, V>| {
+                super<R|kotlin/Any|>()
+            }
 
-            private constructor(typeSerial0: R|kotlinx/serialization/KSerializer<T>|, typeSerial1: R|kotlinx/serialization/KSerializer<V>|): R|GenericBox.$serializer<T, V>|
+            private constructor<T, V>(typeSerial0: R|kotlinx/serialization/KSerializer<T>|, typeSerial1: R|kotlinx/serialization/KSerializer<V>|): R|GenericBox.$serializer<T, V>|
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/defaultProperties.fir.txt

@@ -27,7 +27,9 @@ FILE: defaultProperties.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<SomeClass>|
 
-            private constructor(): R|SomeClass.Companion|
+            private constructor(): R|SomeClass.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -41,7 +43,9 @@ FILE: defaultProperties.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|SomeClass.$serializer|
+            private constructor(): R|SomeClass.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/enums.fir.txt

@@ -47,7 +47,9 @@ FILE: enums.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<WithNames>|
 
-            private constructor(): R|WithNames.Companion|
+            private constructor(): R|WithNames.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -61,7 +63,9 @@ FILE: enums.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|WithNames.$serializer|
+            private constructor(): R|WithNames.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -80,7 +84,9 @@ FILE: enums.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Holder>|
 
-            private constructor(): R|Holder.Companion|
+            private constructor(): R|Holder.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -94,7 +100,9 @@ FILE: enums.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Holder.$serializer|
+            private constructor(): R|Holder.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/inlineClasses.fir.txt

@@ -10,7 +10,9 @@ FILE: inlineClasses.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Foo>|
 
-            private constructor(): R|Foo.Companion|
+            private constructor(): R|Foo.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -24,7 +26,9 @@ FILE: inlineClasses.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Foo.$serializer|
+            private constructor(): R|Foo.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -40,7 +44,9 @@ FILE: inlineClasses.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Holder>|
 
-            private constructor(): R|Holder.Companion|
+            private constructor(): R|Holder.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -54,7 +60,9 @@ FILE: inlineClasses.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Holder.$serializer|
+            private constructor(): R|Holder.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/metaSerializable.fir.txt

@@ -31,7 +31,9 @@ FILE: metaSerializable.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Project1>|
 
-            private constructor(): R|Project1.Companion|
+            private constructor(): R|Project1.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -45,7 +47,9 @@ FILE: metaSerializable.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Project1.$serializer|
+            private constructor(): R|Project1.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -64,7 +68,9 @@ FILE: metaSerializable.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Project2>|
 
-            private constructor(): R|Project2.Companion|
+            private constructor(): R|Project2.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -78,7 +84,9 @@ FILE: metaSerializable.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Project2.$serializer|
+            private constructor(): R|Project2.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -94,7 +102,9 @@ FILE: metaSerializable.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Wrapper>|
 
-            private constructor(): R|Wrapper.Companion|
+            private constructor(): R|Wrapper.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -108,7 +118,9 @@ FILE: metaSerializable.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Wrapper.$serializer|
+            private constructor(): R|Wrapper.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -127,7 +139,9 @@ FILE: metaSerializable.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Project3>|
 
-            private constructor(): R|Project3.Companion|
+            private constructor(): R|Project3.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -141,7 +155,9 @@ FILE: metaSerializable.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Project3.$serializer|
+            private constructor(): R|Project3.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -160,7 +176,9 @@ FILE: metaSerializable.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Project4>|
 
-            private constructor(): R|Project4.Companion|
+            private constructor(): R|Project4.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -181,7 +199,9 @@ FILE: metaSerializable.kt
             public final companion object Companion : R|kotlin/Any| {
                 public final fun serializer(): R|kotlinx/serialization/KSerializer<TestSealed.A>|
 
-                private constructor(): R|TestSealed.A.Companion|
+                private constructor(): R|TestSealed.A.Companion| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -195,7 +215,9 @@ FILE: metaSerializable.kt
 
                 public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-                private constructor(): R|TestSealed.A.$serializer|
+                private constructor(): R|TestSealed.A.$serializer| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -212,7 +234,9 @@ FILE: metaSerializable.kt
             public final companion object Companion : R|kotlin/Any| {
                 public final fun serializer(): R|kotlinx/serialization/KSerializer<TestSealed.B>|
 
-                private constructor(): R|TestSealed.B.Companion|
+                private constructor(): R|TestSealed.B.Companion| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -226,7 +250,9 @@ FILE: metaSerializable.kt
 
                 public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-                private constructor(): R|TestSealed.B.$serializer|
+                private constructor(): R|TestSealed.B.$serializer| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -235,7 +261,9 @@ FILE: metaSerializable.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<TestSealed>|
 
-            private constructor(): R|TestSealed.Companion|
+            private constructor(): R|TestSealed.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -256,7 +284,9 @@ FILE: metaSerializable.kt
             public final companion object Companion : R|kotlin/Any| {
                 public final fun serializer(): R|kotlinx/serialization/KSerializer<TestAbstract.A>|
 
-                private constructor(): R|TestAbstract.A.Companion|
+                private constructor(): R|TestAbstract.A.Companion| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -270,7 +300,9 @@ FILE: metaSerializable.kt
 
                 public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-                private constructor(): R|TestAbstract.A.$serializer|
+                private constructor(): R|TestAbstract.A.$serializer| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -287,7 +319,9 @@ FILE: metaSerializable.kt
             public final companion object Companion : R|kotlin/Any| {
                 public final fun serializer(): R|kotlinx/serialization/KSerializer<TestAbstract.B>|
 
-                private constructor(): R|TestAbstract.B.Companion|
+                private constructor(): R|TestAbstract.B.Companion| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -301,7 +335,9 @@ FILE: metaSerializable.kt
 
                 public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-                private constructor(): R|TestAbstract.B.$serializer|
+                private constructor(): R|TestAbstract.B.$serializer| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -310,7 +346,9 @@ FILE: metaSerializable.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<TestAbstract>|
 
-            private constructor(): R|TestAbstract.Companion|
+            private constructor(): R|TestAbstract.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -334,7 +372,9 @@ FILE: metaSerializable.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<TestEnum>|
 
-            private constructor(): R|TestEnum.Companion|
+            private constructor(): R|TestEnum.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -348,7 +388,9 @@ FILE: metaSerializable.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|TestEnum.$serializer|
+            private constructor(): R|TestEnum.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/multipleProperties.fir.txt

@@ -19,7 +19,9 @@ FILE: multipleProperties.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<SomeClass>|
 
-            private constructor(): R|SomeClass.Companion|
+            private constructor(): R|SomeClass.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -33,7 +35,9 @@ FILE: multipleProperties.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|SomeClass.$serializer|
+            private constructor(): R|SomeClass.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/privatePropertiesSerialization.fir.txt

@@ -30,7 +30,9 @@ FILE: privatePropertiesSerialization.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Parent>|
 
-            private constructor(): R|Parent.Companion|
+            private constructor(): R|Parent.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -44,7 +46,9 @@ FILE: privatePropertiesSerialization.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Parent.$serializer|
+            private constructor(): R|Parent.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -57,7 +61,9 @@ FILE: privatePropertiesSerialization.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<Derived>|
 
-            private constructor(): R|Derived.Companion|
+            private constructor(): R|Derived.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -71,7 +77,9 @@ FILE: privatePropertiesSerialization.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|Derived.$serializer|
+            private constructor(): R|Derived.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/serializableWith.fir.txt

@@ -46,7 +46,9 @@ FILE: serializableWith.kt
         public final companion object Companion : R|kotlin/Any| {
             public final fun serializer(): R|kotlinx/serialization/KSerializer<IntHolder>|
 
-            private constructor(): R|IntHolder.Companion|
+            private constructor(): R|IntHolder.Companion| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/serializableWithCompanion.fir.txt

@@ -53,7 +53,9 @@ FILE: serializableWithCompanion.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|com/example/WithCompanion.$serializer|
+            private constructor(): R|com/example/WithCompanion.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 
@@ -93,7 +95,9 @@ FILE: serializableWithCompanion.kt
 
             public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-            private constructor(): R|com/example/WithNamedCompanion.$serializer|
+            private constructor(): R|com/example/WithNamedCompanion.$serializer| {
+                super<R|kotlin/Any|>()
+            }
 
         }
 

plugins/kotlinx-serialization/testData/firMembers/serializerInLocalClass.fir.txt

@@ -15,7 +15,9 @@ FILE: serializerInLocalClass.kt
             public final companion object Companion : R|kotlin/Any| {
                 public final fun serializer(): R|kotlinx/serialization/KSerializer<Carrier>|
 
-                private constructor(): R|Carrier.Companion|
+                private constructor(): R|Carrier.Companion| {
+                    super<R|kotlin/Any|>()
+                }
 
             }
 
@@ -29,7 +31,9 @@ FILE: serializerInLocalClass.kt
 
                 public final fun childSerializers(): R|kotlin/Array<kotlinx/serialization/KSerializer<*>>|
 
-                private constructor(): R|Carrier.$serializer|
+                private constructor(): R|Carrier.$serializer| {
+                    super<R|kotlin/Any|>()
+                }
 
             }