diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-22 15:44:17 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-22 15:47:58 +0200 |
| commit | 078a1c5fae09970d22b886831e36745b7f7e25db (patch) | |
| tree | f9df2087dbf1984b83d122ce1a3e41a96e6f4920 /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
| parent | e52fa7e652c175f561a1a0804e04b6d00b89aaa6 (diff) | |
| parent | fa4c1de6e7dc5e5703ccf822c5815da9e8ae47ed (diff) | |
| download | scala-078a1c5fae09970d22b886831e36745b7f7e25db.tar.gz scala-078a1c5fae09970d22b886831e36745b7f7e25db.tar.bz2 scala-078a1c5fae09970d22b886831e36745b7f7e25db.zip | |
Merge branch '2.10.x`
Conflicts:
test/files/run/existentials-in-compiler.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 48fd6ba928..0a0bf9d710 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -1214,8 +1214,8 @@ trait Namers extends MethodSynthesis { if (!annotated.isInitialized) tree match { case defn: MemberDef => val ainfos = defn.mods.annotations filterNot (_ eq null) map { ann => - // need to be lazy, #1782 - AnnotationInfo lazily (typer typedAnnotation ann) + // need to be lazy, #1782. enteringTyper to allow inferView in annotation args, SI-5892. + AnnotationInfo lazily enteringTyper(typer typedAnnotation ann) } if (ainfos.nonEmpty) { annotated setAnnotations ainfos |