Correctly handle dumps starting with Targets-list (#202)

Fixes #201

Author: fzhinkin

src/main/kotlin/api/klib/KlibAbiDumpFileMerger.kt

@@ -254,7 +254,7 @@ internal class KlibAbiDumpMerger {
         // then try to parse a manifest
         while (hasNext()) {
             val next = peek()!!
-            if (!next.startsWith(COMMENT_PREFIX)) break
+            if (!next.startsWith(COMMENT_PREFIX) || next.startsWith(TARGETS_LIST_PREFIX)) break
             next()
             // There's no manifest in merged files
             check(!isMergedFile) { "Unexpected header line: $next" }

src/test/kotlin/tests/KlibAbiMergingTest.kt

@@ -336,4 +336,28 @@ class KlibAbiMergingTest {
             KlibAbiDumpMerger().merge(file("/merge/stdlib_native_common.abi"), "target")
         }
     }
+
+    @Test
+    fun mergeDumpsWithNonOverlappingDeclarations() {
+        val dump = dumpToFile(KlibAbiDumpMerger().apply {
+            merge(file("/merge/non-overlapping/linux-arm64.klib.abi"))
+            merge(file("/merge/non-overlapping/linux-x64.klib.abi"))
+        })
+
+        assertContentEquals(
+            lines("/merge/non-overlapping/merged.klib.abi"),
+            Files.readAllLines(dump.toPath()).asSequence()
+        )
+    }
+
+    @Test
+    fun loadMergedDumpWithNonOverlappingDeclarations() {
+        val dump = dumpToFile(KlibAbiDumpMerger().apply {
+            merge(file("/merge/non-overlapping/merged.klib.abi"))
+        })
+        assertContentEquals(
+            lines("/merge/non-overlapping/merged.klib.abi"),
+            Files.readAllLines(dump.toPath()).asSequence()
+        )
+    }
 }

src/test/resources/merge/non-overlapping/linux-arm64.klib.abi

@@ -0,0 +1,9 @@
+// Klib ABI Dump
+// Targets: [linuxArm64]
+// Rendering settings:
+// - Signature version: 2
+// - Show manifest properties: false
+// - Show declarations: true
+
+// Library unique name: <org.example:bcv-klib-test>
+final fun org.example/add(kotlin/Long, kotlin/Long): kotlin/Long // org.example/add|add(kotlin.Long;kotlin.Long){}[0]

src/test/resources/merge/non-overlapping/linux-x64.klib.abi

@@ -0,0 +1,9 @@
+// Klib ABI Dump
+// Targets: [linuxX64]
+// Rendering settings:
+// - Signature version: 2
+// - Show manifest properties: false
+// - Show declarations: true
+
+// Library unique name: <org.example:bcv-klib-test>
+final fun org.example/sub(kotlin/Long, kotlin/Long): kotlin/Long // org.example/sub|sub(kotlin.Long;kotlin.Long){}[0]

src/test/resources/merge/non-overlapping/merged.klib.abi

@@ -0,0 +1,12 @@
+// Klib ABI Dump
+// Targets: [linuxArm64, linuxX64]
+// Rendering settings:
+// - Signature version: 2
+// - Show manifest properties: false
+// - Show declarations: true
+
+// Library unique name: <org.example:bcv-klib-test>
+// Targets: [linuxArm64]
+final fun org.example/add(kotlin/Long, kotlin/Long): kotlin/Long // org.example/add|add(kotlin.Long;kotlin.Long){}[0]
+// Targets: [linuxX64]
+final fun org.example/sub(kotlin/Long, kotlin/Long): kotlin/Long // org.example/sub|sub(kotlin.Long;kotlin.Long){}[0]