summaryrefslogtreecommitdiff
path: root/src/compiler/scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-11-28 09:33:01 -0800
committerPaul Phillips <paulp@improving.org>2012-11-28 09:33:01 -0800
commit08e717eaee731456a51adb08f72aa5d9f083a29a (patch)
tree81698d88ff7bd495bb73f19145adc9e91deae205 /src/compiler/scala
parent9afc00c0408e49a111f381334cbdb7fcdaa4f340 (diff)
parentf9053e5ac67db484e8a9f2acc39cf8d39a2f1f33 (diff)
downloadscala-08e717eaee731456a51adb08f72aa5d9f083a29a.tar.gz
scala-08e717eaee731456a51adb08f72aa5d9f083a29a.tar.bz2
scala-08e717eaee731456a51adb08f72aa5d9f083a29a.zip
Merge pull request #1669 from paulp/update-asm
Updated asm to 4.1.
Diffstat (limited to 'src/compiler/scala')
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
index 1aa80d5c5b..d2e641cbf9 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
@@ -888,10 +888,10 @@ abstract class GenASM extends SubComponent with BytecodeWriters {
// Run the signature parser to catch bogus signatures.
val isValidSignature = wrap {
// Alternative: scala.tools.reflect.SigParser (frontend to sun.reflect.generics.parser.SignatureParser)
- import scala.tools.asm.util.SignatureChecker
- if (sym.isMethod) { SignatureChecker checkMethodSignature sig } // requires asm-util.jar
- else if (sym.isTerm) { SignatureChecker checkFieldSignature sig }
- else { SignatureChecker checkClassSignature sig }
+ import scala.tools.asm.util.CheckClassAdapter
+ if (sym.isMethod) { CheckClassAdapter checkMethodSignature sig } // requires asm-util.jar
+ else if (sym.isTerm) { CheckClassAdapter checkFieldSignature sig }
+ else { CheckClassAdapter checkClassSignature sig }
}
if(!isValidSignature) {