diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-18 09:46:42 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-18 09:46:42 -0700 |
| commit | 6765cb0af5a9f9cedd5c71b052aa963d9d52e8dc (patch) | |
| tree | 2de1c9593c456cf95d3f8bd32977797bdd7d6573 /src | |
| parent | 5639d82cd27d5c86cb5ea27410676935fc6c8635 (diff) | |
| parent | 9c6a7ad81bdb632d3da144d58210b5903b86a3e4 (diff) | |
| download | scala-6765cb0af5a9f9cedd5c71b052aa963d9d52e8dc.tar.gz scala-6765cb0af5a9f9cedd5c71b052aa963d9d52e8dc.tar.bz2 scala-6765cb0af5a9f9cedd5c71b052aa963d9d52e8dc.zip | |
Merge pull request #572 from lrytz/wip/t5544
Fix SI-5544
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index b5e58efaff..7419ec3bce 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -3246,7 +3246,9 @@ trait Typers extends Modes with Adaptations with Taggings { reportAnnotationError(NestedAnnotationError(ann, annType)) } else { val typedAnn = if (selfsym == NoSymbol) { - typed(ann, mode, annClass.tpe) + // local dummy fixes SI-5544 + val localTyper = newTyper(context.make(ann, context.owner.newLocalDummy(ann.pos))) + localTyper.typed(ann, mode, annClass.tpe) } else { // Since a selfsym is supplied, the annotation should have // an extra "self" identifier in scope for type checking. |