diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-02-24 22:35:56 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-02-24 22:41:15 +0100 |
commit | e7ab2f4a978e244cdd4c8c03170caa2a44c7adea (patch) | |
tree | d13d92d880836e009aebcc20b73da81dc45a2f5b /src/compiler/scala/tools/nsc/backend/opt/InlineExceptionHandlers.scala | |
parent | d1b16c4dc484d5f431bc4635148b065e722b2315 (diff) | |
download | scala-e7ab2f4a978e244cdd4c8c03170caa2a44c7adea.tar.gz scala-e7ab2f4a978e244cdd4c8c03170caa2a44c7adea.tar.bz2 scala-e7ab2f4a978e244cdd4c8c03170caa2a44c7adea.zip |
Be explicit about empty param list calls.
With the exception of toString and the odd JavaBean getter.
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/opt/InlineExceptionHandlers.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/opt/InlineExceptionHandlers.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/opt/InlineExceptionHandlers.scala b/src/compiler/scala/tools/nsc/backend/opt/InlineExceptionHandlers.scala index 4e65c72b0b..7f76839ae5 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/InlineExceptionHandlers.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/InlineExceptionHandlers.scala @@ -69,9 +69,9 @@ abstract class InlineExceptionHandlers extends SubComponent { * -some exception handler duplicates expect the exception on the stack while others expect it in a local * => Option[Local] */ - private val handlerCopies = perRunCaches.newMap[BasicBlock, Option[(Option[Local], BasicBlock)]] + private val handlerCopies = perRunCaches.newMap[BasicBlock, Option[(Option[Local], BasicBlock)]]() /* This map is the inverse of handlerCopies, used to compute the stack of duplicate blocks */ - private val handlerCopiesInverted = perRunCaches.newMap[BasicBlock, (BasicBlock, TypeKind)] + private val handlerCopiesInverted = perRunCaches.newMap[BasicBlock, (BasicBlock, TypeKind)]() private def handlerLocal(bb: BasicBlock): Option[Local] = for (v <- handlerCopies get bb ; (local, block) <- v ; l <- local) yield l @@ -357,7 +357,7 @@ abstract class InlineExceptionHandlers extends SubComponent { } val caughtException = toTypeKind(caughtClass.tpe) // copy the exception handler code once again, dropping the LOAD_EXCEPTION - val copy = handler.code.newBlock + val copy = handler.code.newBlock() copy.emitOnly((handler.iterator drop dropCount).toSeq: _*) // extend the handlers of the handler to the copy |