diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-09-15 18:51:55 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-10-02 16:12:28 +0200 |
| commit | bef012d32127e3d256d0ce31e1a2a27f7277f8d8 (patch) | |
| tree | cae40c2211cfece2bfb0312af732ddfaa47c1ac5 /src/dotty/tools/dotc/typer/Typer.scala | |
| parent | ce9efda393055060a73509d1c10b8bdd9f2f0136 (diff) | |
| download | dotty-bef012d32127e3d256d0ce31e1a2a27f7277f8d8.tar.gz dotty-bef012d32127e3d256d0ce31e1a2a27f7277f8d8.tar.bz2 dotty-bef012d32127e3d256d0ce31e1a2a27f7277f8d8.zip | |
Move logic from InlineInfo to BodyAnnot
Now that we have BodyAnnot, InlineInfo can be eliminated.
Diffstat (limited to 'src/dotty/tools/dotc/typer/Typer.scala')
| -rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 885bc56d6..f9fca117d 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -1118,7 +1118,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit def completeAnnotations(mdef: untpd.MemberDef, sym: Symbol)(implicit ctx: Context): Unit = { // necessary to force annotation trees to be computed. - sym.annotations.foreach(_.tree) + sym.annotations.foreach(_.ensureCompleted) val annotCtx = ctx.outersIterator.dropWhile(_.owner == sym).next // necessary in order to mark the typed ahead annotations as definitely typed: untpd.modsDeco(mdef).mods.annotations.foreach(typedAnnotation(_)(annotCtx)) @@ -1173,7 +1173,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit // Overwrite inline body to make sure it is not evaluated twice if (sym.hasAnnotation(defn.InlineAnnot)) - Inliner.registerInlineInfo(sym, _ => rhs1, _ => ctx) + Inliner.registerInlineInfo(sym, _ => rhs1) if (sym.isAnonymousFunction) { // If we define an anonymous function, make sure the return type does not |