From 1ce6d9abad392a87ccf3551590ac098b485df2b6 Mon Sep 17 00:00:00 2001 From: Tiark Rompf Date: Sun, 4 Apr 2010 13:14:44 +0000 Subject: workaround for #3252. review by extempore. --- .../library/scala/util/continuations/ControlContext.scala | 4 ++-- 1 file 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]] -- cgit v1.2.3