diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java index c24a3e7d85b..fe7112c4b2b 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java @@ -94,6 +94,7 @@ public class InterceptionInstrumenter implements Instrumenter { String nameFromAnnotation = annotation.methodName(); String methodName = nameFromAnnotation.isEmpty() ? field.getName() : nameFromAnnotation; MethodInstrumenterImpl instrumenter = new MethodInstrumenterImpl( + field.getDeclaringClass().getSimpleName() + "." + field.getName(), compilePattern(methodName), compilePattern(annotation.erasedSignature()), annotation.allowMultipleMatches(), diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInstrumenterImpl.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInstrumenterImpl.java index 4ac32bb29fc..c0ded7a4b61 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInstrumenterImpl.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInstrumenterImpl.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.regex.Pattern; class MethodInstrumenterImpl implements MethodInstrumenter { + private final String debugName; private final Pattern namePattern; private final Pattern descPattern; private final boolean allowMultipleMatches; @@ -28,13 +29,14 @@ class MethodInstrumenterImpl implements MethodInstrumenter { private final boolean logApplications; public MethodInstrumenterImpl( - Pattern namePattern, + String debugName, Pattern namePattern, Pattern descPattern, boolean allowMultipleMatches, List enterData, List exitData, boolean logApplications ) { + this.debugName = debugName; this.namePattern = namePattern; this.descPattern = descPattern; this.allowMultipleMatches = allowMultipleMatches; @@ -72,6 +74,6 @@ class MethodInstrumenterImpl implements MethodInstrumenter { @Override public String toString() { - return namePattern + " " + descPattern + (allowMultipleMatches ? " [multiple]" : ""); + return debugName + "[" + namePattern + " " + descPattern + (allowMultipleMatches ? " multiple" : "") + "]"; } }