diff --git a/idea/testData/debugger/tinyApp/outs/_kt.out b/idea/testData/debugger/tinyApp/outs/_kt.out
index c07ad4fee83..2638167efa7 100644
--- a/idea/testData/debugger/tinyApp/outs/_kt.out
+++ b/idea/testData/debugger/tinyApp/outs/_kt.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at .kt.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! _DefaultPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-.kt.kt:4
+.kt.kt:5
 Compile bytecode for 1 + 1
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/abstractFunCall.out b/idea/testData/debugger/tinyApp/outs/abstractFunCall.out
index d34e66fc2b8..4133e2e25b8 100644
--- a/idea/testData/debugger/tinyApp/outs/abstractFunCall.out
+++ b/idea/testData/debugger/tinyApp/outs/abstractFunCall.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at abstractFunCall.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! abstractFunCall.AbstractFunCallPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-abstractFunCall.kt:4
+abstractFunCall.kt:5
 Compile bytecode for (1 as java.lang.Number).intValue()
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/arrays.out b/idea/testData/debugger/tinyApp/outs/arrays.out
index c990987eb25..9a97c913041 100644
--- a/idea/testData/debugger/tinyApp/outs/arrays.out
+++ b/idea/testData/debugger/tinyApp/outs/arrays.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at arrays.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! arrays.ArraysPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-arrays.kt:4
+arrays.kt:5
 Compile bytecode for array(1, 2).map { it.toString() }
 Compile bytecode for array(1, 2, 101, 102).filter { it > 100 }
 Compile bytecode for array(1, 2).none()
diff --git a/idea/testData/debugger/tinyApp/outs/callableBug.out b/idea/testData/debugger/tinyApp/outs/callableBug.out
index 701e4af3d77..61daf22af11 100644
--- a/idea/testData/debugger/tinyApp/outs/callableBug.out
+++ b/idea/testData/debugger/tinyApp/outs/callableBug.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at callableBug.kt:8
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! callableBug.CallableBugPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-callableBug.kt:7
+callableBug.kt:8
 Compile bytecode for callable
-callableBug.kt:7
+callableBug.kt:8
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/checkNotNull.out b/idea/testData/debugger/tinyApp/outs/checkNotNull.out
index 291fbd5c16e..bf475b787bb 100644
--- a/idea/testData/debugger/tinyApp/outs/checkNotNull.out
+++ b/idea/testData/debugger/tinyApp/outs/checkNotNull.out
@@ -1,10 +1,10 @@
 LineBreakpoint created at checkNotNull.kt:8
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! checkNotNull.CheckNotNullPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-checkNotNull.kt:7
-MyJavaClass.java:11
-checkNotNull.kt:7
 checkNotNull.kt:8
+MyJavaClass.java:12
+checkNotNull.kt:8
+checkNotNull.kt:9
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out b/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
index 87ba8172a64..d9eb0f86913 100644
--- a/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
+++ b/idea/testData/debugger/tinyApp/outs/classFromAnotherPackage.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at classFromAnotherPackage.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classFromAnotherPackage.ClassFromAnotherPackagePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-classFromAnotherPackage.kt:6
+classFromAnotherPackage.kt:7
 Compile bytecode for MyJavaClass()
 Compile bytecode for stepInto.MyJavaClass()
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out b/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
index 6d6987949ac..0969dd821f5 100644
--- a/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/classObjectFunFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at classObjectFunFromClass.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classObjectFunFromClass.ClassObjectFunFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-classObjectFunFromClass.kt:5
-classObjectFunFromClass.kt:10
+classObjectFunFromClass.kt:6
+classObjectFunFromClass.kt:11
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
index ca103b1308d..7425df1172a 100644
--- a/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/classObjectFunFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at classObjectFunFromTopLevel.kt:13
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classObjectFunFromTopLevel.ClassObjectFunFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-classObjectFunFromTopLevel.kt:12
-classObjectFunFromTopLevel.kt:5
+classObjectFunFromTopLevel.kt:13
+classObjectFunFromTopLevel.kt:6
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/classObjectVal.out b/idea/testData/debugger/tinyApp/outs/classObjectVal.out
index ac5f0bde7c6..20997332f8e 100644
--- a/idea/testData/debugger/tinyApp/outs/classObjectVal.out
+++ b/idea/testData/debugger/tinyApp/outs/classObjectVal.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at classObjectVal.kt:10
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! classObjectVal.ClassObjectValPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-classObjectVal.kt:9
+classObjectVal.kt:10
 Compile bytecode for coProp
 Compile bytecode for MyClass.coProp
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/clearCache.out b/idea/testData/debugger/tinyApp/outs/clearCache.out
index 177d8a47963..b9cd1a9e7d5 100644
--- a/idea/testData/debugger/tinyApp/outs/clearCache.out
+++ b/idea/testData/debugger/tinyApp/outs/clearCache.out
@@ -17,35 +17,35 @@ LineBreakpoint created at clearCache.kt:161
 LineBreakpoint created at clearCache.kt:169
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! clearCache.ClearCachePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-clearCache.kt:11
+clearCache.kt:12
 Compile bytecode for a
-clearCache.kt:19
+clearCache.kt:20
 Compile bytecode for a
-clearCache.kt:30
+clearCache.kt:31
 Compile bytecode for i
-clearCache.kt:30
-clearCache.kt:41
+clearCache.kt:31
+clearCache.kt:42
 Compile bytecode for i
-clearCache.kt:41
-clearCache.kt:51
+clearCache.kt:42
+clearCache.kt:52
 Compile bytecode for o.test()
-clearCache.kt:59
-clearCache.kt:77
+clearCache.kt:60
+clearCache.kt:78
 Compile bytecode for c.size()
-clearCache.kt:85
-clearCache.kt:94
-clearCache.kt:104
-clearCache.kt:112
+clearCache.kt:86
+clearCache.kt:95
+clearCache.kt:105
+clearCache.kt:113
 Compile bytecode for c.size()
-clearCache.kt:122
+clearCache.kt:123
 Compile bytecode for o.test()
-clearCache.kt:130
-clearCache.kt:148
+clearCache.kt:131
+clearCache.kt:149
 Compile bytecode for obj.test()
-clearCache.kt:153
-clearCache.kt:160
+clearCache.kt:154
+clearCache.kt:161
 Compile bytecode for o.test()
-clearCache.kt:168
+clearCache.kt:169
 Compile bytecode for o.test()
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/collections.out b/idea/testData/debugger/tinyApp/outs/collections.out
index c541fe3582a..3ea930eb2e2 100644
--- a/idea/testData/debugger/tinyApp/outs/collections.out
+++ b/idea/testData/debugger/tinyApp/outs/collections.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at collections.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! collections.CollectionsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-collections.kt:5
+collections.kt:6
 Compile bytecode for arrayListOf(1, 2).map { it.toString() }
 Compile bytecode for arrayListOf(1, 2, 101, 102).filter { it > 100 }
 Compile bytecode for arrayListOf(1, 2).max()
diff --git a/idea/testData/debugger/tinyApp/outs/customLibClassName.out b/idea/testData/debugger/tinyApp/outs/customLibClassName.out
index 96be829709a..dea13b99e27 100644
--- a/idea/testData/debugger/tinyApp/outs/customLibClassName.out
+++ b/idea/testData/debugger/tinyApp/outs/customLibClassName.out
@@ -5,15 +5,15 @@ LineBreakpoint created at 1.kt:3
 LineBreakpoint created at simpleLibFile.kt:3
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! customLibClassName.CustomLibClassNamePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-1.kt:3
+1.kt:4
 Compile bytecode for 1 + 1
-1.kt:3
+1.kt:4
 Compile bytecode for 1 + 2
-1.kt:3
+1.kt:4
 Compile bytecode for 1 + 3
-1.kt:3
+1.kt:4
 Compile bytecode for 1 + 4
-simpleLibFile.kt:3
+simpleLibFile.kt:4
 Compile bytecode for 1 + 5
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
index 447f9c40a3f..cd9b3d49fab 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at delegatedPropertyInClass.kt:8
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! delegatedPropertyInClass.DelegatedPropertyInClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-delegatedPropertyInClass.kt:7
+delegatedPropertyInClass.kt:8
 package delegatedPropertyInClass
 
 import kotlin.properties.Delegates
diff --git a/idea/testData/debugger/tinyApp/outs/dependentOnFile.out b/idea/testData/debugger/tinyApp/outs/dependentOnFile.out
index a8c325eac5f..2794df07945 100644
--- a/idea/testData/debugger/tinyApp/outs/dependentOnFile.out
+++ b/idea/testData/debugger/tinyApp/outs/dependentOnFile.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at dependentOnFile.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! dependentOnFile.DependentOnFilePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-dependentOnFile.kt:4
+dependentOnFile.kt:5
 Compile bytecode for TestClass().testFun()
 Compile bytecode for testFun()
 Compile bytecode for TestObject.p
diff --git a/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out b/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out
index bf5585e692d..d48712fa9d3 100644
--- a/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out
+++ b/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at doNotSkipClassloader.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! doNotSkipClassloader.DoNotSkipClassloaderPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-doNotSkipClassloader.kt:6
+doNotSkipClassloader.kt:7
 ClassLoader.!EXT!
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out b/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out
index 1420897d38b..661b2f8d040 100644
--- a/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out
+++ b/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at doNotSkipConstructors.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! doNotSkipConstructors.DoNotSkipConstructorsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-doNotSkipConstructors.kt:4
-doNotSkipConstructors.kt:10
-doNotSkipConstructors.kt:4
+doNotSkipConstructors.kt:5
+doNotSkipConstructors.kt:11
+doNotSkipConstructors.kt:5
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/doubles.out b/idea/testData/debugger/tinyApp/outs/doubles.out
index ab00294a53d..aef546a61fe 100644
--- a/idea/testData/debugger/tinyApp/outs/doubles.out
+++ b/idea/testData/debugger/tinyApp/outs/doubles.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at doubles.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! doubles.DoublesPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-doubles.kt:6
+doubles.kt:7
 Compile bytecode for d1 + d2
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/enums.out b/idea/testData/debugger/tinyApp/outs/enums.out
index eae03d25053..b140979dfbc 100644
--- a/idea/testData/debugger/tinyApp/outs/enums.out
+++ b/idea/testData/debugger/tinyApp/outs/enums.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at enums.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! enums.EnumsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-enums.kt:6
+enums.kt:7
 Compile bytecode for A == MyEnum.A
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/errors.out b/idea/testData/debugger/tinyApp/outs/errors.out
index 1f5592dea14..b6d218e97d0 100644
--- a/idea/testData/debugger/tinyApp/outs/errors.out
+++ b/idea/testData/debugger/tinyApp/outs/errors.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at errors.kt:13
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! errors.ErrorsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-errors.kt:12
+errors.kt:13
 Compile bytecode for prop += 1
 prop2 +=2
 prop + prop2
diff --git a/idea/testData/debugger/tinyApp/outs/exceptions.out b/idea/testData/debugger/tinyApp/outs/exceptions.out
index ed886b46e58..3b391a0d63c 100644
--- a/idea/testData/debugger/tinyApp/outs/exceptions.out
+++ b/idea/testData/debugger/tinyApp/outs/exceptions.out
@@ -6,15 +6,15 @@ LineBreakpoint created at exceptions.kt:42
 LineBreakpoint created at exceptions.kt:51
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! exceptions.ExceptionsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-exceptions.kt:8
+exceptions.kt:9
 Compile bytecode for fail()
-exceptions.kt:13
-exceptions.kt:25
+exceptions.kt:14
+exceptions.kt:26
 Compile bytecode for o as Derived
-exceptions.kt:30
-exceptions.kt:41
+exceptions.kt:31
+exceptions.kt:42
 Compile bytecode for c.get(0)
-exceptions.kt:50
+exceptions.kt:51
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extFun.out b/idea/testData/debugger/tinyApp/outs/extFun.out
index 94280ee0c90..dec0df407eb 100644
--- a/idea/testData/debugger/tinyApp/outs/extFun.out
+++ b/idea/testData/debugger/tinyApp/outs/extFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at extFun.kt:12
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extFun.ExtFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-extFun.kt:11
-extFun.kt:5
+extFun.kt:12
+extFun.kt:6
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out b/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
index b7c43dcb891..3f949ab0d4c 100644
--- a/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
+++ b/idea/testData/debugger/tinyApp/outs/extractLocalVariables.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at extractLocalVariables.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractLocalVariables.ExtractLocalVariablesPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-extractLocalVariables.kt:6
+extractLocalVariables.kt:7
 Compile bytecode for a
 Compile bytecode for klass.f1(1)
 Compile bytecode for args.size
diff --git a/idea/testData/debugger/tinyApp/outs/extractThis.out b/idea/testData/debugger/tinyApp/outs/extractThis.out
index 33bbe9c3271..083ebfc7106 100644
--- a/idea/testData/debugger/tinyApp/outs/extractThis.out
+++ b/idea/testData/debugger/tinyApp/outs/extractThis.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at extractThis.kt:13
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractThis.ExtractThisPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-extractThis.kt:12
+extractThis.kt:13
 Compile bytecode for prop
 Compile bytecode for this.prop
 Compile bytecode for prop + a
diff --git a/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out b/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
index 622a2b036f2..d854f3bd5e2 100644
--- a/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
+++ b/idea/testData/debugger/tinyApp/outs/extractVariablesFromCall.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at extractVariablesFromCall.kt:8
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! extractVariablesFromCall.ExtractVariablesFromCallPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-extractVariablesFromCall.kt:7
+extractVariablesFromCall.kt:8
 Compile bytecode for f1(a, s)
 Compile bytecode for a.f2(s)
 Compile bytecode for a f2 s
diff --git a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
index a3bd0fcf3f3..889e8a9920a 100644
--- a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameAnonymousObject.kt:11
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameAnonymousObject.FrameAnonymousObjectPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameAnonymousObject.kt:10
+frameAnonymousObject.kt:11
 package frameAnonymousObject
 
 fun main(args: Array<String>) {
@@ -28,7 +28,7 @@ fun foo(f: () -> Unit) {
  frame    = invoke():11, FrameAnonymousObjectPackage$@packagePartHASH$main$o$1$run$1 {frameAnonymousObject}
    this     = this = {frameAnonymousObject.FrameAnonymousObjectPackage$@packagePartHASH$main$o$1$run$1@uniqueID}kotlin.Function0<kotlin.Unit>
      field    = this$0: frameAnonymousObject.FrameAnonymousObjectPackage$@packagePartHASH$main$o$1 = {frameAnonymousObject.FrameAnonymousObjectPackage$@packagePartHASH$main$o$1@uniqueID} (sp = null)
-       field    = obProp: int = 1 (sp = frameAnonymousObject.kt, 5)
+       field    = obProp: int = 1 (sp = frameAnonymousObject.kt, 6)
        field    = $val1: int = 1 (sp = null)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameClassObject.out b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
index b3ff356476d..14e4d64e233 100644
--- a/idea/testData/debugger/tinyApp/outs/frameClassObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameClassObject.kt:15
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameClassObject.FrameClassObjectPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameClassObject.kt:14
+frameClassObject.kt:15
 Compile bytecode for prop
 package frameClassObject
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
index 49b4739293e..adc14178b51 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameExtFunExtFun.kt:22
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameExtFunExtFun.FrameExtFunExtFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameExtFunExtFun.kt:21
+frameExtFunExtFun.kt:22
 Compile bytecode for valFoo
 Compile bytecode for valTest
 Compile bytecode for aProp
@@ -71,14 +71,14 @@ fun lambda(f: () -> Unit) {
  frame    = invoke():22, Outer$foo$LocalClass$test$1 {frameExtFunExtFun}
    this     = this = {frameExtFunExtFun.Outer$foo$LocalClass$test$1@uniqueID}kotlin.Function0<kotlin.Unit>
      field    = this$0: frameExtFunExtFun.Outer$foo$LocalClass = {frameExtFunExtFun.Outer$foo$LocalClass@uniqueID} (sp = null)
-       field    = lcProp: int = 1 (sp = frameExtFunExtFun.kt, 16)
+       field    = lcProp: int = 1 (sp = frameExtFunExtFun.kt, 17)
        field    = this$0: frameExtFunExtFun.Outer = {frameExtFunExtFun.Outer@uniqueID} (sp = null)
-         field    = outerProp: int = 1 (sp = frameExtFunExtFun.kt, 11)
+         field    = outerProp: int = 1 (sp = frameExtFunExtFun.kt, 12)
        field    = receiver$0: frameExtFunExtFun.A = {frameExtFunExtFun.A@uniqueID} (sp = null)
-         field    = aProp: int = 1 (sp = frameExtFunExtFun.kt, 7)
+         field    = aProp: int = 1 (sp = frameExtFunExtFun.kt, 8)
        field    = $valFoo: int = 1 (sp = null)
      field    = receiver$0: frameExtFunExtFun.B = {frameExtFunExtFun.B@uniqueID} (sp = null)
-       field    = bProp: int = 1 (sp = frameExtFunExtFun.kt, 38)
+       field    = bProp: int = 1 (sp = frameExtFunExtFun.kt, 39)
      field    = $valTest: int = 1 (sp = null)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
index a991a076b7b..94c47b16492 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameExtensionFun.kt:13
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameExtensionFun.FrameExtensionFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameExtensionFun.kt:12
+frameExtensionFun.kt:13
 Compile bytecode for prop
 package frameExtensionFun
 
@@ -25,7 +25,7 @@ fun A.foo() {
  frame    = foo():13, FrameExtensionFunPackage$@packagePartHASH {frameExtensionFun}
    static   = static = frameExtensionFun.FrameExtensionFunPackage$@packagePartHASH
    local    = $receiver: frameExtensionFun.A = {frameExtensionFun.A@uniqueID}
-     field    = prop: int = 1 (sp = frameExtensionFun.kt, 7)
+     field    = prop: int = 1 (sp = frameExtensionFun.kt, 8)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
index 4e805ac7b57..c18d338c35f 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameInnerClass.kt:15
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInnerClass.FrameInnerClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameInnerClass.kt:14
+frameInnerClass.kt:15
 Compile bytecode for prop1
 Compile bytecode for prop2
 package frameInnerClass
@@ -32,9 +32,9 @@ class A {
 // RESULT: 1: I
  frame    = test():15, A$Inner {frameInnerClass}
    this     = this = {frameInnerClass.A$Inner@uniqueID}
-     field    = prop2: int = 1 (sp = frameInnerClass.kt, 10)
+     field    = prop2: int = 1 (sp = frameInnerClass.kt, 11)
      field    = this$0: frameInnerClass.A = {frameInnerClass.A@uniqueID} (sp = null)
-       field    = prop1: int = 1 (sp = frameInnerClass.kt, 7)
+       field    = prop1: int = 1 (sp = frameInnerClass.kt, 8)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
index d8be7f51a30..3c6384e2727 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameInnerLambda.kt:9
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameInnerLambda.FrameInnerLambdaPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameInnerLambda.kt:8
+frameInnerLambda.kt:9
 Compile bytecode for val1
 Compile bytecode for val2
 Compile bytecode for val1 + val2
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambda.out b/idea/testData/debugger/tinyApp/outs/frameLambda.out
index 9cb1d75f1c2..21330ac7c06 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambda.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameLambda.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameLambda.FrameLambdaPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameLambda.kt:6
+frameLambda.kt:7
 Compile bytecode for val1
 package frameLambda
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
index 68d09807ab5..d74fc1c2e3b 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameLambdaNotUsed.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameLambdaNotUsed.FrameLambdaNotUsedPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameLambdaNotUsed.kt:6
+frameLambdaNotUsed.kt:7
 Compile bytecode for val1
 package frameLambdaNotUsed
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameObject.out b/idea/testData/debugger/tinyApp/outs/frameObject.out
index ddd3127cf14..eb47c2bce9a 100644
--- a/idea/testData/debugger/tinyApp/outs/frameObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameObject.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameObject.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameObject.FrameObjectPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameObject.kt:5
+frameObject.kt:6
 Compile bytecode for O.obProp
 package frameObject
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
index 1e006bc9f57..aca31410807 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameSharedVar.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameSharedVar.FrameSharedVarPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameSharedVar.kt:6
+frameSharedVar.kt:7
 Compile bytecode for var1
 package frameSharedVar
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
index db8d43902dd..cf6308984a9 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameSharedVarLocalVar.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameSharedVarLocalVar.FrameSharedVarLocalVarPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameSharedVarLocalVar.kt:6
+frameSharedVarLocalVar.kt:7
 Compile bytecode for var1
 package frameSharedVarLocalVar
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameSimple.out b/idea/testData/debugger/tinyApp/outs/frameSimple.out
index 8459b23a7a4..25e7d196c03 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSimple.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameSimple.kt:9
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameSimple.FrameSimplePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameSimple.kt:8
+frameSimple.kt:9
 Compile bytecode for val1
 Compile bytecode for val2
 Compile bytecode for topVal1
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0.out b/idea/testData/debugger/tinyApp/outs/frameThis0.out
index f3dfddcb743..619e479045d 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameThis0.kt:15
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameThis0.FrameThis0Package
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameThis0.kt:14
+frameThis0.kt:15
 Compile bytecode for val1
 Compile bytecode for val2
 Compile bytecode for prop1
@@ -45,7 +45,7 @@ fun foo(f: () -> Unit) {
  frame    = invoke():15, A$test$1 {frameThis0}
    this     = this = {frameThis0.A$test$1@uniqueID}kotlin.Function0<kotlin.Unit>
      field    = this$0: frameThis0.A = {frameThis0.A@uniqueID} (sp = null)
-       field    = prop1: int = 1 (sp = frameThis0.kt, 7)
+       field    = prop1: int = 1 (sp = frameThis0.kt, 8)
      field    = $val1: int = 1 (sp = null)
    local    = val2: int = 1
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
index 68212210229..6b5a2de97fa 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameThis0Ext.kt:14
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameThis0Ext.FrameThis0ExtPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameThis0Ext.kt:13
+frameThis0Ext.kt:14
 Compile bytecode for val1
 Compile bytecode for prop1
 Compile bytecode for prop2
@@ -56,9 +56,9 @@ fun foo(f: () -> Unit) {
  frame    = invoke():14, A$testExt$1 {frameThis0Ext}
    this     = this = {frameThis0Ext.A$testExt$1@uniqueID}kotlin.Function0<kotlin.Unit>
      field    = this$0: frameThis0Ext.A = {frameThis0Ext.A@uniqueID} (sp = null)
-       field    = prop1: int = 1 (sp = frameThis0Ext.kt, 7)
+       field    = prop1: int = 1 (sp = frameThis0Ext.kt, 8)
      field    = receiver$0: frameThis0Ext.AExt = {frameThis0Ext.AExt@uniqueID} (sp = null)
-       field    = prop2: int = 1 (sp = frameThis0Ext.kt, 23)
+       field    = prop2: int = 1 (sp = frameThis0Ext.kt, 24)
      field    = $val1: int = 1 (sp = null)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
index edf873c7bd9..0de3c095a12 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at frameThis0This0.kt:16
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! frameThis0This0.FrameThis0This0Package
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-frameThis0This0.kt:15
+frameThis0This0.kt:16
 Compile bytecode for val1
 Compile bytecode for val2
 Compile bytecode for prop1
@@ -48,7 +48,7 @@ fun foo(f: () -> Unit) {
    this     = this = {frameThis0This0.A$test$1$1@uniqueID}kotlin.Function0<kotlin.Unit>
      field    = this$0: frameThis0This0.A$test$1 = {frameThis0This0.A$test$1@uniqueID}kotlin.Function0<kotlin.Unit> (sp = null)
        field    = this$0: frameThis0This0.A = {frameThis0This0.A@uniqueID} (sp = null)
-         field    = prop1: int = 1 (sp = frameThis0This0.kt, 7)
+         field    = prop1: int = 1 (sp = frameThis0This0.kt, 8)
        field    = $val1: int = 1 (sp = null)
      field    = $val2: int = 1 (sp = null)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/funFromSuperClass.out b/idea/testData/debugger/tinyApp/outs/funFromSuperClass.out
index ff3b5bb0af8..1b30179c23b 100644
--- a/idea/testData/debugger/tinyApp/outs/funFromSuperClass.out
+++ b/idea/testData/debugger/tinyApp/outs/funFromSuperClass.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at funFromSuperClass.kt:12
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! funFromSuperClass.FunFromSuperClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-funFromSuperClass.kt:11
+funFromSuperClass.kt:12
 Compile bytecode for foo()
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/imports.out b/idea/testData/debugger/tinyApp/outs/imports.out
index 6dff3868f51..24ce92b3f26 100644
--- a/idea/testData/debugger/tinyApp/outs/imports.out
+++ b/idea/testData/debugger/tinyApp/outs/imports.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at imports.kt:10
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! imports.ImportsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-imports.kt:9
+imports.kt:10
 Compile bytecode for Collections.emptyList<String>()
 Compile bytecode for ArrayList<Int>()
 Compile bytecode for HashSet<Int>()
diff --git a/idea/testData/debugger/tinyApp/outs/inlineLambda.out b/idea/testData/debugger/tinyApp/outs/inlineLambda.out
index a37bf635845..c4aa3fd2b31 100644
--- a/idea/testData/debugger/tinyApp/outs/inlineLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/inlineLambda.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at inlineLambda.kt:9
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! inlineLambda.InlineLambdaPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-inlineLambda.kt:8
-inlineLambda.kt:8
+inlineLambda.kt:9
+inlineLambda.kt:9
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/insertInBlock.out b/idea/testData/debugger/tinyApp/outs/insertInBlock.out
index e8ec30b7e27..76802337d78 100644
--- a/idea/testData/debugger/tinyApp/outs/insertInBlock.out
+++ b/idea/testData/debugger/tinyApp/outs/insertInBlock.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at insertInBlock.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! insertInBlock.InsertInBlockPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-insertInBlock.kt:5
+insertInBlock.kt:6
 Compile bytecode for 1 + 1
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/javaFun.out b/idea/testData/debugger/tinyApp/outs/javaFun.out
index 1b21f69a076..dcd2729e9cf 100644
--- a/idea/testData/debugger/tinyApp/outs/javaFun.out
+++ b/idea/testData/debugger/tinyApp/outs/javaFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at javaFun.kt:8
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! javaFun.JavaFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-javaFun.kt:7
-MyJavaClass.java:6
+javaFun.kt:8
+MyJavaClass.java:7
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out b/idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out
index 841b090fff0..2fd066ac9aa 100644
--- a/idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out
+++ b/idea/testData/debugger/tinyApp/outs/kt5554OnlyIntsShouldBeCoerced.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at kt5554OnlyIntsShouldBeCoerced.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! kt5554OnlyIntsShouldBeCoerced.Kt5554OnlyIntsShouldBeCoercedPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-kt5554OnlyIntsShouldBeCoerced.kt:4
+kt5554OnlyIntsShouldBeCoerced.kt:5
 Compile bytecode for Class.forName("java.lang.Object").getGenericInterfaces()
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out b/idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out
index 87d4a4b2682..3d1cd670644 100644
--- a/idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out
+++ b/idea/testData/debugger/tinyApp/outs/lambdaOnSecondLine.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at lambdaOnSecondLine.kt:10
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! lambdaOnSecondLine.LambdaOnSecondLinePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-lambdaOnSecondLine.kt:9
-lambdaOnSecondLine.kt:14
-lambdaOnSecondLine.kt:9
+lambdaOnSecondLine.kt:10
+lambdaOnSecondLine.kt:15
+lambdaOnSecondLine.kt:10
 Compile bytecode for it
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out b/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
index d0541164d0b..c4fdd6589d1 100644
--- a/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/memberFunFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at memberFunFromClass.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberFunFromClass.MemberFunFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-memberFunFromClass.kt:5
-memberFunFromClass.kt:9
+memberFunFromClass.kt:6
+memberFunFromClass.kt:10
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
index 695902256f5..c0459835889 100644
--- a/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/memberFunFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at memberFunFromTopLevel.kt:13
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberFunFromTopLevel.MemberFunFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-memberFunFromTopLevel.kt:12
-memberFunFromTopLevel.kt:4
+memberFunFromTopLevel.kt:13
+memberFunFromTopLevel.kt:5
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out b/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
index c960bc69cb8..13f1c782d95 100644
--- a/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/memberGetterFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at memberGetterFromClass.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberGetterFromClass.MemberGetterFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-memberGetterFromClass.kt:5
-memberGetterFromClass.kt:10
+memberGetterFromClass.kt:6
+memberGetterFromClass.kt:11
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
index d90868d08f4..c2bc590529f 100644
--- a/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/memberGetterFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at memberGetterFromTopLevel.kt:15
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! memberGetterFromTopLevel.MemberGetterFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-memberGetterFromTopLevel.kt:14
-memberGetterFromTopLevel.kt:5
+memberGetterFromTopLevel.kt:15
+memberGetterFromTopLevel.kt:6
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out b/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
index 26780684eb5..7961f817d9b 100644
--- a/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
+++ b/idea/testData/debugger/tinyApp/outs/methodWithBreakpoint.out
@@ -2,7 +2,7 @@ LineBreakpoint created at methodWithBreakpoint.kt:5
 LineBreakpoint created at methodWithBreakpoint.kt:10
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! methodWithBreakpoint.MethodWithBreakpointPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-methodWithBreakpoint.kt:4
+methodWithBreakpoint.kt:5
 Compile bytecode for foo()
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out b/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
index ffae2baf184..8cb4a25734f 100644
--- a/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
+++ b/idea/testData/debugger/tinyApp/outs/multilineExpressionAtBreakpoint.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at multilineExpressionAtBreakpoint.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! multilineExpressionAtBreakpoint.MultilineExpressionAtBreakpointPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-multilineExpressionAtBreakpoint.kt:4
+multilineExpressionAtBreakpoint.kt:5
 Compile bytecode for 1 + 1
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/npe.out b/idea/testData/debugger/tinyApp/outs/npe.out
index 560f81c2ba2..6eb221a3c78 100644
--- a/idea/testData/debugger/tinyApp/outs/npe.out
+++ b/idea/testData/debugger/tinyApp/outs/npe.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at npe.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! npe.NpePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-npe.kt:6
-npe.kt:9
+npe.kt:7
+npe.kt:10
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/objectFun.out b/idea/testData/debugger/tinyApp/outs/objectFun.out
index f884e0c20e8..281dadf8074 100644
--- a/idea/testData/debugger/tinyApp/outs/objectFun.out
+++ b/idea/testData/debugger/tinyApp/outs/objectFun.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at objectFun.kt:11
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! objectFun.ObjectFunPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-objectFun.kt:10
-objectFun.kt:4
+objectFun.kt:11
+objectFun.kt:5
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/oneLineLambda.out b/idea/testData/debugger/tinyApp/outs/oneLineLambda.out
index 77e27111907..371a11d5fd9 100644
--- a/idea/testData/debugger/tinyApp/outs/oneLineLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/oneLineLambda.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at oneLineLambda.kt:9
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! oneLineLambda.OneLineLambdaPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-oneLineLambda.kt:8
-oneLineLambda.kt:13
-oneLineLambda.kt:8
+oneLineLambda.kt:9
+oneLineLambda.kt:14
+oneLineLambda.kt:9
 Compile bytecode for it
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/privateMember.out b/idea/testData/debugger/tinyApp/outs/privateMember.out
index 7088f737d86..336374b400a 100644
--- a/idea/testData/debugger/tinyApp/outs/privateMember.out
+++ b/idea/testData/debugger/tinyApp/outs/privateMember.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at privateMember.kt:9
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! privateMember.PrivateMemberPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-privateMember.kt:8
+privateMember.kt:9
 Compile bytecode for MyClass().privateFun()
 Compile bytecode for MyClass().privateVal
 Compile bytecode for MyClass.PrivateClass().a
diff --git a/idea/testData/debugger/tinyApp/outs/protectedMember.out b/idea/testData/debugger/tinyApp/outs/protectedMember.out
index c1cc717108b..d7a0a87dbef 100644
--- a/idea/testData/debugger/tinyApp/outs/protectedMember.out
+++ b/idea/testData/debugger/tinyApp/outs/protectedMember.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at protectedMember.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! protectedMember.ProtectedMemberPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-protectedMember.kt:4
+protectedMember.kt:5
 Compile bytecode for MyClass().protectedFun()
 Compile bytecode for MyClass().protectedVal
 Compile bytecode for MyClass.ProtectedClass().a
diff --git a/idea/testData/debugger/tinyApp/outs/reflectKClass.out b/idea/testData/debugger/tinyApp/outs/reflectKClass.out
index 65930a9e8bc..426128c5b49 100644
--- a/idea/testData/debugger/tinyApp/outs/reflectKClass.out
+++ b/idea/testData/debugger/tinyApp/outs/reflectKClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at reflectKClass.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! reflectKClass.ReflectKClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-reflectKClass.kt:4
 reflectKClass.kt:5
+reflectKClass.kt:6
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/simple.out b/idea/testData/debugger/tinyApp/outs/simple.out
index ac01d96a2cb..ab6735cf4b0 100644
--- a/idea/testData/debugger/tinyApp/outs/simple.out
+++ b/idea/testData/debugger/tinyApp/outs/simple.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at simple.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! simple.SimplePackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-simple.kt:5
+simple.kt:6
 Compile bytecode for 1
 Compile bytecode for 1 + 1
 Compile bytecode for val a = 1
diff --git a/idea/testData/debugger/tinyApp/outs/skipClassloader.out b/idea/testData/debugger/tinyApp/outs/skipClassloader.out
index 1a1185b65ac..2e017da3f4c 100644
--- a/idea/testData/debugger/tinyApp/outs/skipClassloader.out
+++ b/idea/testData/debugger/tinyApp/outs/skipClassloader.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at skipClassloader.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! skipClassloader.SkipClassloaderPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-skipClassloader.kt:6
-skipClassloader.kt:4
+skipClassloader.kt:7
+skipClassloader.kt:5
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/skipConstructors.out b/idea/testData/debugger/tinyApp/outs/skipConstructors.out
index 09d384df3a0..0dbcf4b5cd4 100644
--- a/idea/testData/debugger/tinyApp/outs/skipConstructors.out
+++ b/idea/testData/debugger/tinyApp/outs/skipConstructors.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at skipConstructors.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! skipConstructors.SkipConstructorsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-skipConstructors.kt:4
 skipConstructors.kt:5
+skipConstructors.kt:6
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stdlib.out b/idea/testData/debugger/tinyApp/outs/stdlib.out
index 4879e377a62..5acedb5e5b7 100644
--- a/idea/testData/debugger/tinyApp/outs/stdlib.out
+++ b/idea/testData/debugger/tinyApp/outs/stdlib.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at stdlib.kt:5
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stdlib.StdlibPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-stdlib.kt:4
+stdlib.kt:5
 Compile bytecode for array(100, 101)
 Compile bytecode for array("a", "b", "c")
 Compile bytecode for intArray(1, 2)
diff --git a/idea/testData/debugger/tinyApp/outs/stdlibStep.out b/idea/testData/debugger/tinyApp/outs/stdlibStep.out
index a0261823e47..fcfd337cccc 100644
--- a/idea/testData/debugger/tinyApp/outs/stdlibStep.out
+++ b/idea/testData/debugger/tinyApp/outs/stdlibStep.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at stdlibStep.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stdlibStep.StdlibStepPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-stdlibStep.kt:5
 stdlibStep.kt:6
+stdlibStep.kt:7
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
index 5b843eb2e43..bdd1cc9bd58 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
@@ -1,12 +1,12 @@
 LineBreakpoint created at stepIntoSpecificKotlinClasses.kt:8
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoSpecificKotlinClasses.StepIntoSpecificKotlinClassesPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-stepIntoSpecificKotlinClasses.kt:7
-MyJavaClass.java:11
-stepIntoSpecificKotlinClasses.kt:7
-Intrinsics.!EXT!
-stepIntoSpecificKotlinClasses.kt:7
 stepIntoSpecificKotlinClasses.kt:8
+MyJavaClass.java:12
+stepIntoSpecificKotlinClasses.kt:8
+Intrinsics.!EXT!
+stepIntoSpecificKotlinClasses.kt:8
+stepIntoSpecificKotlinClasses.kt:9
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out b/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out
index 176e67202f0..4e9d962fe3e 100644
--- a/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at stepIntoStdlib.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoStdlib.StepIntoStdlibPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-stepIntoStdlib.kt:5
+stepIntoStdlib.kt:6
 KotlinPackage.!EXT!
 _Mapping.!EXT!
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
diff --git a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
index b94b18df01d..e9d17b3a972 100644
--- a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at toStringRenderer.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! toStringRenderer.ToStringRendererPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-toStringRenderer.kt:5
+toStringRenderer.kt:6
 package toStringRenderer
 
 fun main(args: Array<String>) {
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out b/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
index ddf85690523..dfa07e75cd6 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelFunFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at topLevelFunFromClass.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelFunFromClass.TopLevelFunFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-topLevelFunFromClass.kt:5
-topLevelFunFromClass.kt:10
+topLevelFunFromClass.kt:6
+topLevelFunFromClass.kt:11
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
index d2e12658406..c382e289ef9 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelFunFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at topLevelFunFromTopLevel.kt:9
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelFunFromTopLevel.TopLevelFunFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-topLevelFunFromTopLevel.kt:8
-topLevelFunFromTopLevel.kt:3
+topLevelFunFromTopLevel.kt:9
+topLevelFunFromTopLevel.kt:4
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
index e4869eae785..feed27fe277 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromClass.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at topLevelGetterFromClass.kt:6
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelGetterFromClass.TopLevelGetterFromClassPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-topLevelGetterFromClass.kt:5
-topLevelGetterFromClass.kt:11
+topLevelGetterFromClass.kt:6
+topLevelGetterFromClass.kt:12
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
index ff7e9ebb9dc..778b2328f38 100644
--- a/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
+++ b/idea/testData/debugger/tinyApp/outs/topLevelGetterFromTopLevel.out
@@ -1,8 +1,8 @@
 LineBreakpoint created at topLevelGetterFromTopLevel.kt:11
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! topLevelGetterFromTopLevel.TopLevelGetterFromTopLevelPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-topLevelGetterFromTopLevel.kt:10
-topLevelGetterFromTopLevel.kt:4
+topLevelGetterFromTopLevel.kt:11
+topLevelGetterFromTopLevel.kt:5
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out
index 67ab5bea45e..4bba20502da 100644
--- a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out
+++ b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineFirst.out
@@ -1,9 +1,9 @@
 LineBreakpoint created at twoLambdasOnOneLineFirst.kt:9
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! twoLambdasOnOneLineFirst.TwoLambdasOnOneLineFirstPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-twoLambdasOnOneLineFirst.kt:8
-twoLambdasOnOneLineFirst.kt:13
-twoLambdasOnOneLineFirst.kt:8
+twoLambdasOnOneLineFirst.kt:9
+twoLambdasOnOneLineFirst.kt:14
+twoLambdasOnOneLineFirst.kt:9
 Compile bytecode for it
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out
index 995732d847d..883ab4b221d 100644
--- a/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out
+++ b/idea/testData/debugger/tinyApp/outs/twoLambdasOnOneLineSecond.out
@@ -1,11 +1,11 @@
 LineBreakpoint created at twoLambdasOnOneLineSecond.kt:9
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! twoLambdasOnOneLineSecond.TwoLambdasOnOneLineSecondPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-twoLambdasOnOneLineSecond.kt:8
-twoLambdasOnOneLineSecond.kt:15
-twoLambdasOnOneLineSecond.kt:8
-twoLambdasOnOneLineSecond.kt:15
-twoLambdasOnOneLineSecond.kt:8
+twoLambdasOnOneLineSecond.kt:9
+twoLambdasOnOneLineSecond.kt:16
+twoLambdasOnOneLineSecond.kt:9
+twoLambdasOnOneLineSecond.kt:16
+twoLambdasOnOneLineSecond.kt:9
 Compile bytecode for it
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/vars.out b/idea/testData/debugger/tinyApp/outs/vars.out
index cc800cc3fc2..d798a10eccc 100644
--- a/idea/testData/debugger/tinyApp/outs/vars.out
+++ b/idea/testData/debugger/tinyApp/outs/vars.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at vars.kt:7
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! vars.VarsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-vars.kt:6
+vars.kt:7
 Compile bytecode for a
 Compile bytecode for a += 1
 a
diff --git a/idea/testData/debugger/tinyApp/outs/whenEntry.out b/idea/testData/debugger/tinyApp/outs/whenEntry.out
index 2a61721a34b..5a4458b2581 100644
--- a/idea/testData/debugger/tinyApp/outs/whenEntry.out
+++ b/idea/testData/debugger/tinyApp/outs/whenEntry.out
@@ -3,11 +3,11 @@ LineBreakpoint created at whenEntry.kt:18
 LineBreakpoint created at whenEntry.kt:26
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! whenEntry.WhenEntryPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-whenEntry.kt:9
+whenEntry.kt:10
 Compile bytecode for a
-whenEntry.kt:17
+whenEntry.kt:18
 Compile bytecode for a
-whenEntry.kt:25
+whenEntry.kt:26
 Compile bytecode for a
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out b/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
index fe868902e2c..a347a3066e7 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyFunctions.out
@@ -6,15 +6,15 @@ LineBreakpoint created at withoutBodyFunctions.kt:32
 LineBreakpoint created at withoutBodyFunctions.kt:36
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyFunctions.WithoutBodyFunctionsPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-withoutBodyFunctions.kt:8
+withoutBodyFunctions.kt:9
 Compile bytecode for 1 + 1
-withoutBodyFunctions.kt:14
+withoutBodyFunctions.kt:15
 Compile bytecode for 1 + 2
-withoutBodyFunctions.kt:20
+withoutBodyFunctions.kt:21
 Compile bytecode for i
-withoutBodyFunctions.kt:26
+withoutBodyFunctions.kt:27
 Compile bytecode for i
-withoutBodyFunctions.kt:31
+withoutBodyFunctions.kt:32
 Compile bytecode for i
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out b/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
index 2cbc0502450..23229406ada 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyProperties.out
@@ -5,16 +5,16 @@ LineBreakpoint created at withoutBodyProperties.kt:29
 LineBreakpoint created at withoutBodyProperties.kt:36
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyProperties.WithoutBodyPropertiesPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-withoutBodyProperties.kt:7
+withoutBodyProperties.kt:8
 Compile bytecode for 1 + 1
-withoutBodyProperties.kt:12
+withoutBodyProperties.kt:13
 Compile bytecode for 1 + 2
-withoutBodyProperties.kt:17
+withoutBodyProperties.kt:18
 Compile bytecode for 1 + 3
-withoutBodyProperties.kt:28
+withoutBodyProperties.kt:29
 Compile bytecode for i
-withoutBodyProperties.kt:28
-withoutBodyProperties.kt:35
+withoutBodyProperties.kt:29
+withoutBodyProperties.kt:36
 Compile bytecode for 1 + 4
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out b/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
index a0f0e020957..dc6c7971cf9 100644
--- a/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
+++ b/idea/testData/debugger/tinyApp/outs/withoutBodyTypeParameters.out
@@ -1,7 +1,7 @@
 LineBreakpoint created at withoutBodyTypeParameters.kt:8
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! withoutBodyTypeParameters.WithoutBodyTypeParametersPackage
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
-withoutBodyTypeParameters.kt:7
+withoutBodyTypeParameters.kt:8
 Compile bytecode for i
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt
index 2f953921f9f..1b96f10ef92 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt
@@ -75,7 +75,7 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() {
             return FileUtil.getNameWithoutExtension(virtualFile.getName()) + ".!EXT!"
         }
 
-        return virtualFile.getName() + ":" + sourcePosition.getLine()
+        return virtualFile.getName() + ":" + (sourcePosition.getLine() + 1)
     }
 
     protected fun finish() {