From 076166c22f9f5c3a1712f35c0cea6d868615b52d Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 16 Jul 2019 19:44:59 +0900
Subject: [PATCH] Debugger: Generate line numbers for class initializers with a
 number on the 'init' keyword (KT-16277)

Debugger tests not absent as they use the bootstrap version of kotlinc.
Obviously, this change is not present in it yet.
---
 .../kotlin/codegen/ExpressionCodegen.java          |  2 +-
 .../jetbrains/kotlin/codegen/MemberCodegen.java    | 13 +++++++++++--
 compiler/testData/lineNumber/custom/initBlocks.kt  | 14 +++++++++++++-
 .../testData/stepping/custom/initBlocks.kt         |  2 +-
 .../testData/stepping/custom/initBlocks.out        |  1 +
 .../stepping/filters/doNotSkipConstructors.kt      |  2 +-
 .../stepping/filters/doNotSkipConstructors.out     |  1 +
 7 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index eb3152fa44c..3389dbbb372 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -1473,7 +1473,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
         markLineNumber(element, false);
     }
 
-    public void markLineNumber(@NotNull KtElement statement, boolean markEndOffset) {
+    public void markLineNumber(@NotNull PsiElement statement, boolean markEndOffset) {
         if (!shouldMarkLineNumbers) return;
 
         Integer lineNumber = CodegenUtil.getLineNumberForElement(statement, markEndOffset);
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 6d010fd7b46..37dbce6f074 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -507,9 +507,18 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
                     if (i == declarations.size() - 1 && this instanceof ScriptCodegen) {
                         bodyExpressionType = expressionCodegen.expressionType(body);
                     }
+
+                    if (declaration instanceof KtClassInitializer) {
+                        KtClassInitializer classInitializer = (KtClassInitializer) declaration;
+                        expressionCodegen.markLineNumber(classInitializer.getInitKeyword(), true);
+                        expressionCodegen.v.nop();
+                    }
+
                     expressionCodegen.gen(body, bodyExpressionType);
-                    expressionCodegen.markLineNumber(declaration, true);
-                    nopSeparatorNeeded = true;
+                    if (declaration instanceof KtClassInitializer) {
+                        expressionCodegen.markLineNumber(declaration, true);
+                        nopSeparatorNeeded = true;
+                    }
                 }
             }
         }
diff --git a/compiler/testData/lineNumber/custom/initBlocks.kt b/compiler/testData/lineNumber/custom/initBlocks.kt
index 35c10efe2d1..09b0cecb0e5 100644
--- a/compiler/testData/lineNumber/custom/initBlocks.kt
+++ b/compiler/testData/lineNumber/custom/initBlocks.kt
@@ -28,7 +28,19 @@ class Boo {
     }
 }
 
+class Zoo {
+    init { val a = 5 }
+
+    init { val b = 6 }
+
+    init {
+        val c = 7
+    }
+
+    init { val d = 8 }
+}
+
 fun x() = ""
 
 // IGNORE_BACKEND: JVM_IR
-// 2 2 1 5 6 9 11 12 15 16 24 19 21 22 24 27 28 31
\ No newline at end of file
+// 2 2 1 4 5 6 9 10 11 12 14 15 16 24 19 20 21 22 24 26 27 28 31 32 34 36 37 38 40 43
\ No newline at end of file
diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/initBlocks.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/initBlocks.kt
index f7f56e16011..dcd8427d406 100644
--- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/initBlocks.kt
+++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/initBlocks.kt
@@ -15,4 +15,4 @@ fun main() {
     Foo()
 }
 
-// STEP_OVER: 5
\ No newline at end of file
+// STEP_OVER: 6
\ No newline at end of file
diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/initBlocks.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/initBlocks.out
index f168dabb684..05c81e63835 100644
--- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/initBlocks.out
+++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/custom/initBlocks.out
@@ -3,6 +3,7 @@ Run Java
 Connected to the target VM
 initBlocks.kt:6
 initBlocks.kt:7
+initBlocks.kt:9
 initBlocks.kt:10
 initBlocks.kt:11
 initBlocks.kt:15
diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/doNotSkipConstructors.kt b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/doNotSkipConstructors.kt
index d3f2260ed1e..52518a636d9 100644
--- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/doNotSkipConstructors.kt
+++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/doNotSkipConstructors.kt
@@ -13,4 +13,4 @@ class A {
 }
 
 // SKIP_CONSTRUCTORS: false
-// STEP_INTO: 3
+// STEP_INTO: 4
diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/doNotSkipConstructors.out b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/doNotSkipConstructors.out
index 6d006f7baf8..6edb9b7d20c 100644
--- a/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/doNotSkipConstructors.out
+++ b/idea/jvm-debugger/jvm-debugger-test/testData/stepping/filters/doNotSkipConstructors.out
@@ -3,6 +3,7 @@ Run Java
 Connected to the target VM
 doNotSkipConstructors.kt:5
 doNotSkipConstructors.kt:9
+doNotSkipConstructors.kt:10
 doNotSkipConstructors.kt:11
 doNotSkipConstructors.kt:12
 Disconnected from the target VM