From b0d27820c82a4f31cac13498b3d078e5efc2c352 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Fri, 19 May 2017 00:19:46 +0300
Subject: [PATCH] Minor tweaks to KonanLibrary.

---
 .../kotlin/backend/konan/library/KonanLibrary.kt          | 8 ++------
 .../org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt
index f863656fe62..7b93a3ee61a 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt
@@ -118,16 +118,12 @@ class SplitLibraryReader(override val libDir: File, configuration: CompilerConfi
 
             if (!libDir.exists) error("Could not unpack $klibFile as $libDir.")
         } else {
-            error("Expected $klibFile to be a regular libDir.")
+            error("Expected $klibFile to be a regular file.")
         }
     }
 
-    private val File.dirAbsolutePaths: List<String>
-        get() = this.listFiles!!.toList()!!.map{it->it.absolutePath}
-
     override val bitcodePaths: List<String>
-        get() = kotlinDir.dirAbsolutePaths + 
-                nativeDir.dirAbsolutePaths
+        get() = (kotlinDir.listFiles + nativeDir.listFiles).map{it.absolutePath}
 
 }
 /* ------------ writer part ----------------*/
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt
index aa206a93991..300c07b9615 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/NoJavaUtil.kt
@@ -45,7 +45,7 @@ class File(val path: String) {
     val isFile 
         get() = javaFile.isFile()
     val listFiles
-        get() = javaFile.listFiles()
+        get() = javaFile.listFiles()!!.toList()
 
     fun mkdirs() = javaFile.mkdirs()
     fun delete() = javaFile.delete()