diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-09-12 10:17:27 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-09-12 10:17:27 -0700 |
| commit | e176a1005186f5d6da8ed5a79820d12ca7280e3b (patch) | |
| tree | 2ebf64420d1d6a92575c754e0911c6d7cf1bc989 /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 502b9f0551d1216db72f91031aab1113e5a39f4a (diff) | |
| parent | d5ce3de30e2cb291ec83be00f26b7aced8b8a873 (diff) | |
| download | scala-e176a1005186f5d6da8ed5a79820d12ca7280e3b.tar.gz scala-e176a1005186f5d6da8ed5a79820d12ca7280e3b.tar.bz2 scala-e176a1005186f5d6da8ed5a79820d12ca7280e3b.zip | |
Merge pull request #2906 from retronym/merge/2.10.x-to-2.10.3v2.10.3-RC2
Merge/2.10.x to 2.10.3
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index bf2170310f..e27f540a7d 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -4107,7 +4107,7 @@ trait Typers extends Modes with Adaptations with Tags { // we need symbol-ful originals for reification // hence we go the extra mile to hand-craft tis guy val original = arg1 match { - case tt @ TypeTree() => Annotated(ann, tt.original) + case tt @ TypeTree() if tt.original != null => Annotated(ann, tt.original) // this clause is needed to correctly compile stuff like "new C @D" or "@(inline @getter)" case _ => Annotated(ann, arg1) } |