summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert.plociniczak@epfl.ch>2010-12-17 16:10:35 +0000
committerHubert Plociniczak <hubert.plociniczak@epfl.ch>2010-12-17 16:10:35 +0000
commita6163bcd8fa5c0886022912e759b9ce47a18196a (patch)
tree4b30d50021e11b47f5724d338e05467deeace94d /src/compiler
parent4885cc5e088a517e181d2bc1e3713dc6d3b697c2 (diff)
downloadscala-a6163bcd8fa5c0886022912e759b9ce47a18196a.tar.gz
scala-a6163bcd8fa5c0886022912e759b9ce47a18196a.tar.bz2
scala-a6163bcd8fa5c0886022912e759b9ce47a18196a.zip
Temporary fix for #4092. No review
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/Types.scala9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index b82380c0c2..0efe87eb33 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -3831,8 +3831,13 @@ A type's typeSymbol should never be inspected directly.
}
def apply(tp: Type): Type = tp match {
case ThisType(sym) =>
- val sym1 = adaptToNewRun(sym.owner.thisType, sym)
- if (sym1 == sym) tp else ThisType(sym1)
+ try {
+ val sym1 = adaptToNewRun(sym.owner.thisType, sym)
+ if (sym1 == sym) tp else ThisType(sym1)
+ } catch {
+ case ex: MissingTypeControl =>
+ NoType
+ }
case SingleType(pre, sym) =>
if (sym.isPackage) tp
else {