summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-07-13 07:07:02 +0000
committerPaul Phillips <paulp@improving.org>2011-07-13 07:07:02 +0000
commit038fef39ad4310fc3fe1c5324b004e42fd0036b3 (patch)
treee80ff954e6c259a5bc4a795e1923211c40028fd4 /src
parent60974b90da3e689112da3d54c37414f668b18155 (diff)
downloadscala-038fef39ad4310fc3fe1c5324b004e42fd0036b3.tar.gz
scala-038fef39ad4310fc3fe1c5324b004e42fd0036b3.tar.bz2
scala-038fef39ad4310fc3fe1c5324b004e42fd0036b3.zip
Don't enter into same line infinite recursion w...
Don't enter into same line infinite recursion when erroneous code involves a self-normalizing type alias. Closes #3240, review by moors.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/reflect/internal/Types.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala
index aa12414608..bb5608917b 100644
--- a/src/compiler/scala/reflect/internal/Types.scala
+++ b/src/compiler/scala/reflect/internal/Types.scala
@@ -1790,8 +1790,8 @@ trait Types extends api.Types { self: SymbolTable =>
relativeInfoCache
}
- override def typeSymbol = if (sym.isAliasType) normalize.typeSymbol else sym
- override def termSymbol = if (sym.isAliasType) normalize.termSymbol else super.termSymbol
+ override def typeSymbol = if (sym.isAliasType && (this ne normalize)) normalize.typeSymbol else sym
+ override def termSymbol = if (sym.isAliasType && (this ne normalize)) normalize.termSymbol else super.termSymbol
override def typeSymbolDirect = sym
override def termSymbolDirect = super.termSymbol