diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-09-22 10:45:34 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-09-22 10:45:34 +0200 |
| commit | 9995935b6160171527b121263db75b56be6a9ca7 (patch) | |
| tree | 64d08ed1295f00730eca11dbf714de6e03790166 /src/library | |
| parent | 128d632573b2d87f16b27724084570df5e3fe2a5 (diff) | |
| parent | 133e7d053cc62ce0703d611e34fa750175cc3b48 (diff) | |
| download | scala-9995935b6160171527b121263db75b56be6a9ca7.tar.gz scala-9995935b6160171527b121263db75b56be6a9ca7.tar.bz2 scala-9995935b6160171527b121263db75b56be6a9ca7.zip | |
Merge pull request #4711 from lrytz/opt/heuristics
Inliner heuristic for higher-order methods
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/immutable/List.scala | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala index 7b1997252d..eb095dbbc2 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -266,7 +266,6 @@ sealed abstract class List[+A] extends AbstractSeq[A] (b.toList, these) } - @noinline // TODO - fix optimizer bug that requires noinline (see SI-8334) final override def map[B, That](f: A => B)(implicit bf: CanBuildFrom[List[A], B, That]): That = { if (bf eq List.ReusableCBF) { if (this eq Nil) Nil.asInstanceOf[That] else { @@ -285,7 +284,6 @@ sealed abstract class List[+A] extends AbstractSeq[A] else super.map(f) } - @noinline // TODO - fix optimizer bug that requires noinline for map; applied here to be safe (see SI-8334) final override def collect[B, That](pf: PartialFunction[A, B])(implicit bf: CanBuildFrom[List[A], B, That]): That = { if (bf eq List.ReusableCBF) { if (this eq Nil) Nil.asInstanceOf[That] else { @@ -315,7 +313,6 @@ sealed abstract class List[+A] extends AbstractSeq[A] else super.collect(pf) } - @noinline // TODO - fix optimizer bug that requires noinline for map; applied here to be safe (see SI-8334) final override def flatMap[B, That](f: A => GenTraversableOnce[B])(implicit bf: CanBuildFrom[List[A], B, That]): That = { if (bf eq List.ReusableCBF) { if (this eq Nil) Nil.asInstanceOf[That] else { |