diff options
author | Tiark Rompf <tiark.rompf@epfl.ch> | 2010-04-04 13:14:44 +0000 |
---|---|---|
committer | Tiark Rompf <tiark.rompf@epfl.ch> | 2010-04-04 13:14:44 +0000 |
commit | 1ce6d9abad392a87ccf3551590ac098b485df2b6 (patch) | |
tree | 7c5067093185976301ac4aa4d8b9996aeb7051ec /src/continuations | |
parent | 081df6755b92b9041de405d872987b98d28ef646 (diff) | |
download | scala-1ce6d9abad392a87ccf3551590ac098b485df2b6.tar.gz scala-1ce6d9abad392a87ccf3551590ac098b485df2b6.tar.bz2 scala-1ce6d9abad392a87ccf3551590ac098b485df2b6.zip |
workaround for #3252. review by extempore.
Diffstat (limited to 'src/continuations')
-rw-r--r-- | src/continuations/library/scala/util/continuations/ControlContext.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/continuations/library/scala/util/continuations/ControlContext.scala b/src/continuations/library/scala/util/continuations/ControlContext.scala index 37e84e7d59..87a9bf1fc5 100644 --- a/src/continuations/library/scala/util/continuations/ControlContext.scala +++ b/src/continuations/library/scala/util/continuations/ControlContext.scala @@ -27,7 +27,7 @@ private class cpsMinus extends Annotation // implementation detail */ - final def map[A1](f: A => A1): ControlContext[A1,B,C] = { + @noinline final def map[A1](f: A => A1): ControlContext[A1,B,C] = { if (fun eq null) try { new ControlContext(null, f(x)) // TODO: only alloc if f(x) != x @@ -55,7 +55,7 @@ private class cpsMinus extends Annotation // implementation detail // it would be nice if @inline would turn the trivial path into a tail call. // unfortunately it doesn't, so we do it ourselves in SelectiveCPSTransform - /*@inline*/ final def flatMap[A1,B1,C1<:B](f: (A => ControlContext[A1,B1,C1])): ControlContext[A1,B1,C] = { + @noinline final def flatMap[A1,B1,C1<:B](f: (A => ControlContext[A1,B1,C1])): ControlContext[A1,B1,C] = { if (fun eq null) try { f(x).asInstanceOf[ControlContext[A1,B1,C]] |