From 64f63ab3961b0c0497895bcccc6285d18aa2ca0f Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Tue, 8 Dec 2009 10:16:16 +0000 Subject: make exception handlers catching faster. --- src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 95af7a8c03..8e41801d3f 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -986,9 +986,11 @@ abstract class GenJVM extends SubComponent { if (settings.debug.value) log("Adding exception handler " + e + "at block: " + e.startBlock + " for " + method + " from: " + p._1 + " to: " + p._2 + " catching: " + e.cls); + val cls = if (e.cls == NoSymbol || e.cls == definitions.ThrowableClass) null + else javaName(e.cls) jcode.addExceptionHandler(p._1, p._2, labels(e.startBlock).getAnchor(), - if (e.cls == NoSymbol) null else javaName(e.cls)) + cls) } else log("Empty exception range: " + p) } -- cgit v1.2.3