From 238bfe37714d57ff8ec88a7c907890e0ff3860ee Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Fri, 14 Feb 2020 12:51:51 +0700
Subject: [PATCH] Fix compilation

---
 .../org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt | 2 +-
 .../org/jetbrains/kotlin/checkers/AbstractFirPsiCheckerTest.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt
index 8bec3e60381..aa0279fd32e 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt
@@ -47,7 +47,7 @@ abstract class AbstractIrLineNumberTest : AbstractLineNumberTest() {
             }
 
             override fun visitLabel(label: Label) {
-                if (lastLabel != null && !labels2LineNumbers.containsKey(lastLabel) && lastLine >= 0) {
+                if (lastLabel != null && !labels2LineNumbers.containsKey(lastLabel!!) && lastLine >= 0) {
                     labels2LineNumbers[lastLabel!!] = lastLine.toString() // Inherited line number
                 }
                 lastLabel = label
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractFirPsiCheckerTest.kt b/idea/tests/org/jetbrains/kotlin/checkers/AbstractFirPsiCheckerTest.kt
index dda0ad66591..036c2c9958f 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractFirPsiCheckerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractFirPsiCheckerTest.kt
@@ -39,7 +39,7 @@ abstract class AbstractFirPsiCheckerTest : AbstractPsiCheckerTest() {
                 throw FileComparisonFailure(e.message, e.expected, e.actual, File(e.filePath).absolutePath)
             } else {
                 // Here we just check that we haven't crashed due to exception
-                0
+                0L
             }
         } finally {
             if (configured) {