[MERGE] Kotlin/Native history merged into kotlin/master

compiler/testData/codegen/box/javaInterop/generics/kt42824.kt

@@ -1,6 +1,7 @@
 // DONT_TARGET_EXACT_BACKEND: WASM
 // IGNORE_BACKEND: JS
 // IGNORE_BACKEND: JS_IR
+// IGNORE_BACKEND: NATIVE
 // FILE: DiagnosticFactory0.java
 
 import org.jetbrains.annotations.NotNull;

compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt

@@ -60,7 +60,10 @@ class CodeConformanceTest : TestCase() {
                 "libraries/tools/kotlin-test-nodejs-runner/node_modules",
                 "libraries/tools/kotlinp/src",
                 "libraries/tools/new-project-wizard/new-project-wizard-cli/build",
-                "out"
+                "out",
+                "kotlin-native/build",
+                "kotlin-native/performance",
+                "kotlin-native/samples"
             )
         )
 
@@ -99,7 +102,9 @@ class CodeConformanceTest : TestCase() {
                 "libraries/tools/kotlin-test-js-runner/node_modules",
                 "libraries/tools/kotlin-test-nodejs-runner/.gradle",
                 "libraries/tools/kotlin-test-nodejs-runner/node_modules",
-                "out"
+                "kotlin-native", // Have a separate licences manager
+                "out",
+                "kotlin-native/runtime"
             )
         )
     }

compiler/util-io/src/org/jetbrains/kotlin/konan/CompilerVersion.kt

@@ -53,10 +53,8 @@ data class CompilerVersionImpl(
         append(major)
         append('.')
         append(minor)
-        if (maintenance != 0) {
-            append('.')
-            append(maintenance)
-        }
+        append('.')
+        append(maintenance)
         if (milestone != -1) {
             append("-M")
             append(milestone)

compiler/util-io/src/org/jetbrains/kotlin/util/Util.kt

@@ -10,12 +10,15 @@ import org.jetbrains.kotlin.konan.file.*
 import java.lang.StringBuilder
 
 fun <T> printMillisec(message: String, body: () -> T): T {
-    val result: T
-    val msec = measureTimeMillis {
-        result = body()
+    var msec = 0L
+    try {
+        msec = measureTimeMillis {
+            return body()
+        }
+    } finally {
+        println("$message: $msec msec")
     }
-    println("$message: $msec msec")
-    return result
+    error("shouldn't happens")
 }
 
 fun profile(message: String, body: () -> Unit) = profileIf(