summaryrefslogtreecommitdiff
path: root/src/partest-javaagent/scala/tools/partest/javaagent/ProfilerVisitor.java
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2014-05-14 09:03:05 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2014-05-20 14:54:19 +0200
commit2cd8f4535a82ea0df919c06fd1ea73ee02f9bad9 (patch)
treed7bbdfccd7e314bbdca288b3cbc68ca26beda651 /src/partest-javaagent/scala/tools/partest/javaagent/ProfilerVisitor.java
parent051456c94b45057c617ae802a427533b9c8590b6 (diff)
downloadscala-2cd8f4535a82ea0df919c06fd1ea73ee02f9bad9.tar.gz
scala-2cd8f4535a82ea0df919c06fd1ea73ee02f9bad9.tar.bz2
scala-2cd8f4535a82ea0df919c06fd1ea73ee02f9bad9.zip
Upgrade ASM to 5.0.2
This commit is a squashed version of all commits in PR #3747. For future upgrades, consult the README and check the commits in https://github.com/scala/scala/pull/3747/commits There's one bug in ASM 5.0.2 that breaks scalac: http://forge.ow2.org/tracker/?func=detail&aid=317200&group_id=23&atid=100023 This bug is fixed in ASM trunk, the patch has been merged into this commit. A future upgrade of ASM should contain the fix.
Diffstat (limited to 'src/partest-javaagent/scala/tools/partest/javaagent/ProfilerVisitor.java')
-rw-r--r--src/partest-javaagent/scala/tools/partest/javaagent/ProfilerVisitor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/partest-javaagent/scala/tools/partest/javaagent/ProfilerVisitor.java b/src/partest-javaagent/scala/tools/partest/javaagent/ProfilerVisitor.java
index b1b100fbb0..d97756c171 100644
--- a/src/partest-javaagent/scala/tools/partest/javaagent/ProfilerVisitor.java
+++ b/src/partest-javaagent/scala/tools/partest/javaagent/ProfilerVisitor.java
@@ -50,7 +50,7 @@ public class ProfilerVisitor extends ClassVisitor implements Opcodes {
mv.visitLdcInsn(name);
mv.visitLdcInsn(desc);
mv.visitMethodInsn(INVOKESTATIC, profilerClass, "methodCalled",
- "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+ "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", false);
}
}
return mv;