summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2010-10-11 07:20:47 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2010-10-11 07:20:47 +0000
commit72cf31c7acf46b1073d0c1e2ab6a87b55b7e92f5 (patch)
treea7f49763e4db0d7b9099726c6b48a1d382abb782 /src
parenta350673750d431c4f6159c908e3aca4af43057c4 (diff)
downloadscala-72cf31c7acf46b1073d0c1e2ab6a87b55b7e92f5.tar.gz
scala-72cf31c7acf46b1073d0c1e2ab6a87b55b7e92f5.tar.bz2
scala-72cf31c7acf46b1073d0c1e2ab6a87b55b7e92f5.zip
temporary fix for compiler crash in dependend m...
temporary fix for compiler crash in dependend method types with annotations. review by moors.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/Types.scala8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index d4f322ed9f..8f72bdcde6 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -3605,8 +3605,12 @@ A type's typeSymbol should never be inspected directly.
override def transform(tree: Tree): Tree = {
tree match {
case RefParamAt(pid) =>
- if(actuals(pid) isStable) mkAttributedQualifier(actuals(pid), tree.symbol)
- else {
+ // TODO: this should be simplified; in the stable case, one can probably
+ // just use an Ident to the tree.symbol. Why an existential in the non-stable case?
+ val actual = actuals(pid)
+ if(actual.isStable && actual.typeSymbol != NothingClass) {
+ mkAttributedQualifier(actuals(pid), tree.symbol)
+ } else {
val sym = existSymFor(pid)
(Ident(sym.name)
copyAttrs tree