From a4b7023f650885bc7b8878f8f701466b608dbe52 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 21 Mar 2018 18:48:26 +0100
Subject: [PATCH] Fix compilation errors in builtinsSerializer test data

---
 .../annotationArguments/primitiveArrays.kt           |  2 +-
 .../builtinsSerializer/annotationTargets.kt          |  2 +-
 .../builtinsSerializer/nestedClassesAndObjects.kt    | 11 +----------
 .../builtinsSerializer/nestedClassesAndObjects.txt   | 12 +-----------
 .../serialization/builtinsSerializer/simple.kt       |  6 +++---
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt
index a003d1f04ef..e37614c667c 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.kt
@@ -1,7 +1,7 @@
 package test
 
 annotation class PrimitiveArrays(
-        val byteArray: ByteArray
+        val byteArray: ByteArray,
         val charArray: CharArray,
         val shortArray: ShortArray,
         val intArray: IntArray,
diff --git a/compiler/testData/serialization/builtinsSerializer/annotationTargets.kt b/compiler/testData/serialization/builtinsSerializer/annotationTargets.kt
index 873107bd1b3..61278bee3a6 100644
--- a/compiler/testData/serialization/builtinsSerializer/annotationTargets.kt
+++ b/compiler/testData/serialization/builtinsSerializer/annotationTargets.kt
@@ -13,7 +13,7 @@ val p1 = null
 fun Long.f2(@anno("extension function parameter") p: Int) {}
 
 @anno("extension property")
-val Double.p2: Double get() = null
+val Double.p2: Double get() = 0.0
 
 @anno("top level class")
 class C1 @anno("constructor") constructor() {
diff --git a/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.kt b/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.kt
index 5c61f9cd560..fc4bfa5012b 100644
--- a/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.kt
+++ b/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.kt
@@ -15,18 +15,10 @@ class ClassA {
 
     inner class classC {
         val memberFromC: Int = 200
-
-        class CC {
-            val memberFromCC: Int = 250
-        }
-
-        object CO {
-            val memberFromCO: Int = 265
-        }
     }
 
     companion object {
-        val stat: Int
+        val stat: Int = 250
 
         class D {
             val memberFromD: Int = 275
@@ -37,4 +29,3 @@ class ClassA {
         val memberFromObjA: Int = 300
     }
 }
-
diff --git a/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.txt b/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.txt
index e100e7b6163..be1537f3a43 100644
--- a/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.txt
+++ b/compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.txt
@@ -5,7 +5,7 @@ public final class ClassA {
 
     public companion object Companion {
         private constructor Companion()
-        public final val stat: kotlin.Int
+        public final val stat: kotlin.Int = 250
 
         public final class D {
             public constructor D()
@@ -36,15 +36,5 @@ public final class ClassA {
     public final inner class classC {
         public constructor classC()
         public final val memberFromC: kotlin.Int = 200
-
-        public final class CC {
-            public constructor CC()
-            public final val memberFromCC: kotlin.Int = 250
-        }
-
-        public object CO {
-            private constructor CO()
-            public final val memberFromCO: kotlin.Int = 265
-        }
     }
 }
diff --git a/compiler/testData/serialization/builtinsSerializer/simple.kt b/compiler/testData/serialization/builtinsSerializer/simple.kt
index ad0837bf69a..36b8496c363 100644
--- a/compiler/testData/serialization/builtinsSerializer/simple.kt
+++ b/compiler/testData/serialization/builtinsSerializer/simple.kt
@@ -4,8 +4,8 @@ class Class {
     fun member() = null
 }
 
-fun function(int: Int, string: String = "default"): Class
+fun function(int: Int, string: String = "default"): Class = Class()
 
-fun <T> T.extension(): T?
+fun <T> T.extension(): T? = null
 
-val property: Unit
+val property: Unit = Unit