diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-08-29 08:29:26 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-08-29 08:29:26 +0200 |
| commit | 9772ec8b2f15fd8c2971413d90006beb8bf0d2b7 (patch) | |
| tree | 3b3b35fda741c01d46a620113ed463689bcc469e /src | |
| parent | ba86ac61f489573d10590c5fc601e73673f204f1 (diff) | |
| download | scala-9772ec8b2f15fd8c2971413d90006beb8bf0d2b7.tar.gz scala-9772ec8b2f15fd8c2971413d90006beb8bf0d2b7.tar.bz2 scala-9772ec8b2f15fd8c2971413d90006beb8bf0d2b7.zip | |
typedAnnotated no longer emits nulls
Adds a null-check in original synthesis for the result of typedAnnotated.
Previously it was possible for the aforementioned result to look like
TypeTree(<tpe>) setOriginal Annotated(..., null). Not anymore.
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) } |