diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-09-04 07:14:27 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-09-04 07:14:27 -0700 |
| commit | d46519da657ada39d9928308709cdb80ddcd53ce (patch) | |
| tree | 22f9f9144842107a264b0d0bb33f3d74d8530c85 /src | |
| parent | 068b9a36cb651fea9782f8e1c46d64a81d0f369a (diff) | |
| parent | 9772ec8b2f15fd8c2971413d90006beb8bf0d2b7 (diff) | |
| download | scala-d46519da657ada39d9928308709cdb80ddcd53ce.tar.gz scala-d46519da657ada39d9928308709cdb80ddcd53ce.tar.bz2 scala-d46519da657ada39d9928308709cdb80ddcd53ce.zip | |
Merge pull request #2888 from xeno-by/topic/typed-annotated
typedAnnotated no longer emits nulls
Diffstat (limited to 'src')
| -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) } |