diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-06 07:24:59 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-06 07:25:06 -0700 |
| commit | 8c3b69341f1f3c1ca42a35b496829bbef1696cbb (patch) | |
| tree | feed5809e928520baca2257666fd0e12f4e437ae /src/compiler | |
| parent | 87c9fc0df0f0e74d3a07f95634356d6425877091 (diff) | |
| download | scala-8c3b69341f1f3c1ca42a35b496829bbef1696cbb.tar.gz scala-8c3b69341f1f3c1ca42a35b496829bbef1696cbb.tar.bz2 scala-8c3b69341f1f3c1ca42a35b496829bbef1696cbb.zip | |
Disable dysfunctional inline annotation.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/reflect/internal/util/Collections.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/reflect/internal/util/Collections.scala b/src/compiler/scala/reflect/internal/util/Collections.scala index d26a1abadb..9dbf1adeef 100644 --- a/src/compiler/scala/reflect/internal/util/Collections.scala +++ b/src/compiler/scala/reflect/internal/util/Collections.scala @@ -10,6 +10,8 @@ import scala.annotation.tailrec import mutable.ListBuffer /** Profiler driven changes. + * TODO - inlining doesn't work from here because of the bug that + * methods in traits aren't inlined. */ trait Collections { /** True if all three arguments have the same number of elements and @@ -75,7 +77,8 @@ trait Collections { } } - @inline final def findOrElse[A](xs: TraversableOnce[A])(p: A => Boolean)(orElse: => A): A = { + // @inline + final def findOrElse[A](xs: TraversableOnce[A])(p: A => Boolean)(orElse: => A): A = { xs find p getOrElse orElse } |