aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/TypeComparer.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-12-14 19:15:18 +0100
committerMartin Odersky <odersky@gmail.com>2014-12-15 16:36:53 +0100
commit332b1af33441b382b3e1efa68c5dab4fcda8b2bc (patch)
treeb04a52702b09d8423fc053f88e1883940e27b600 /src/dotty/tools/dotc/core/TypeComparer.scala
parent0eec180a686a4425bd3f3089006eda530123fe2e (diff)
downloaddotty-332b1af33441b382b3e1efa68c5dab4fcda8b2bc.tar.gz
dotty-332b1af33441b382b3e1efa68c5dab4fcda8b2bc.tar.bz2
dotty-332b1af33441b382b3e1efa68c5dab4fcda8b2bc.zip
Replace Throwable catches with NonFatal
Previously, stackoverflows led to infinite loops because the catch immediately threw another stack overflow. Anyway, one should never catch Throwable.
Diffstat (limited to 'src/dotty/tools/dotc/core/TypeComparer.scala')
-rw-r--r--src/dotty/tools/dotc/core/TypeComparer.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/TypeComparer.scala b/src/dotty/tools/dotc/core/TypeComparer.scala
index 42af31553..076015d99 100644
--- a/src/dotty/tools/dotc/core/TypeComparer.scala
+++ b/src/dotty/tools/dotc/core/TypeComparer.scala
@@ -12,6 +12,7 @@ import util.{Stats, DotClass, SimpleMap}
import config.Config
import config.Printers._
import TypeErasure.{erasedLub, erasedGlb}
+import scala.util.control.NonFatal
/** Provides methods to compare types.
*/
@@ -401,7 +402,7 @@ class TypeComparer(initctx: Context) extends DotClass {
result
} catch {
- case ex: Throwable =>
+ case NonFatal(ex) =>
def showState = {
println(disambiguated(implicit ctx => s"assertion failure for ${tp1.show} <:< ${tp2.show}, frozen = $frozenConstraint"))
def explainPoly(tp: Type) = tp match {