From 19ab7ab10fabe7113f45063ffd2b6cc6abcc3329 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 6 Sep 2016 13:20:39 +0200 Subject: Make inline annotation @scala.inline. Drop @dotty.annotation.inline. This will inline all @inline marked methods in Scala for which a body is known (i.e. that are either compiled in the same run or have Tasty trees available). Option -Yno-inline suppresses inlining. This is needed for the moment because some @inline methods access private members or members that are otherwise inaccessible at the call-site. Also fixes some problems in Inliner - make sure type arguments to inline calls re fully defined - don't forget recursive calls in typeMap - don't forget positions in treeMap - drop dead code dealing with outer. --- tests/run/inlinePower/power_1.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/run/inlinePower/power_1.scala') diff --git a/tests/run/inlinePower/power_1.scala b/tests/run/inlinePower/power_1.scala index 1faa10516..23da6009a 100644 --- a/tests/run/inlinePower/power_1.scala +++ b/tests/run/inlinePower/power_1.scala @@ -2,7 +2,7 @@ package p object pow { - @dotty.annotation.inline + @inline def power(x: Double, n: Int): Double = if (n == 0) 1.0 else if (n == 1) x -- cgit v1.2.3