diff --git a/.idea/artifacts/Instrumentation.xml b/.idea/artifacts/Instrumentation.xml index 908fba322f2..37a11748bd1 100644 --- a/.idea/artifacts/Instrumentation.xml +++ b/.idea/artifacts/Instrumentation.xml @@ -3,8 +3,7 @@ $PROJECT_DIR$/out/artifacts/Instrumentation - - + \ No newline at end of file diff --git a/compiler/preloader/instrumentation/ReadMe.md b/compiler/preloader/instrumentation/ReadMe.md index 22506fd0086..f3f048e2f34 100644 --- a/compiler/preloader/instrumentation/ReadMe.md +++ b/compiler/preloader/instrumentation/ReadMe.md @@ -12,7 +12,7 @@ org.jetbrains.jet.preloading.Preloader \ dist/kotlinc/lib/kotlin-compiler.jar \ org.jetbrains.jet.cli.jvm.K2JVMCompiler \ 5000 \ - instrument=out/artifacts/instrumentation_jar/instrumentation.jar \ + instrument=out/artifacts/Instrumentation/instrumentation.jar \ ``` diff --git a/compiler/preloader/instrumentation/instrumentation.iml b/compiler/preloader/instrumentation/instrumentation.iml index d7a80fb225f..bedfa6e4240 100644 --- a/compiler/preloader/instrumentation/instrumentation.iml +++ b/compiler/preloader/instrumentation/instrumentation.iml @@ -8,8 +8,6 @@ - - - + \ No newline at end of file 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 b51dfa327d3..cb26a95d75c 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 @@ -431,7 +431,7 @@ public class InterceptionInstrumenter { } private TraceMethodVisitor getDumpingVisitorWrapper(MethodVisitor mv, final String methodName, final String methodDesc) { - return new TraceMethodVisitor(mv, new Textifier() { + return new TraceMethodVisitor(mv, new Textifier(ASM5) { @Override public void visitMethodEnd() { System.out.println(cr.getClassName() + ":" + methodName + methodDesc); @@ -479,7 +479,7 @@ public class InterceptionInstrumenter { if (i == methodData.getThisParameterIndex()) { if (isStatic || thisUnavailable) { // a) static method, 'this' is null - // b) this is not available (some locations in constructors + // b) this is not available (some locations in constructors) ia.aconst(null); } else {