diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-08-27 22:12:28 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-17 22:05:04 +0200 |
| commit | c35c9c77a976b06aeae04d15493ec4995a2a6448 (patch) | |
| tree | 36645b8e8791b9c809ab803033a1260df26f0b8a /src/library/scala/collection/immutable/List.scala | |
| parent | 9dd5f95f956fbfd1dc4bab0c7ef69cc60bf85f2c (diff) | |
| download | scala-c35c9c77a976b06aeae04d15493ec4995a2a6448.tar.gz scala-c35c9c77a976b06aeae04d15493ec4995a2a6448.tar.bz2 scala-c35c9c77a976b06aeae04d15493ec4995a2a6448.zip | |
Revert workaround for SI-8334
The new optimizer doesn't have this problem.
Diffstat (limited to 'src/library/scala/collection/immutable/List.scala')
| -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 { |