azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Instrumentation artifact dependencies and readme

Browse Source
This commit is contained in:
Alexander Udalov
2015-01-03 14:22:04 +03:00
parent fbb7baa5db
commit 64c00efc92
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/artifacts/Instrumentation.xml
Generated
+1 -2
View File
@@ -3,8 +3,7 @@
<output-path>$PROJECT_DIR$/out/artifacts/Instrumentation</output-path>
<root id="archive" name="Instrumentation.jar">
<element id="module-output" name="instrumentation" />
<element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/jetbrains-asm-debug-all-4.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/guava-17.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/asm-all.jar" path-in-jar="/" />
</root>
</artifact>
</component>
compiler/preloader/instrumentation/ReadMe.md
+1 -1
View File
@@ -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 \
<compiler's command-line args>
```
compiler/preloader/instrumentation/instrumentation.iml
+1 -3
View File
@@ -8,8 +8,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="asm" level="project" />
<orderEntry type="library" name="guava" level="project" />
<orderEntry type="module" module-name="preloader" scope="PROVIDED" />
</component>
</module>
</module>
compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java
+2 -2
View File
@@ -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 {