From 50c9c93f377b6c982b22bf74f4b41dd31186f663 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 11 Feb 2015 14:23:57 +0300 Subject: [PATCH] Generate additional NOP in inline call to keep linenumbers --- .../src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index 2db76113be3..fe61c8a0e17 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -260,6 +260,9 @@ public class InlineCodegen extends CallGenerator { MethodNode adapter = InlineCodegenUtil.createEmptyMethodNode(); + //hack to keep linenumber info, otherwise jdi will skip begin of linenumber chain + adapter.visitInsn(Opcodes.NOP); + InlineResult result = inliner.doInline(adapter, remapper, true, LabelOwner.SKIP_ALL); result.getReifiedTypeParametersUsages().mergeAll(reificationResult);