Simplify the adaptation of types of return expressions

Add `adaptTypeOfReturn` hook to `AnnotationCheckers`.
Move adaptation of types of return expressions from `addAnnotations`
to `typedReturn` via `adaptTypeOfReturn` hook.

This resolves an inconsistency where previously types could have
a plus marker without additional CPS annotations. This also adds
additional test cases.

1 files changed, 17 insertions, 0 deletions

diff --git a/test/files/continuations-run/t5314-with-if.scala b/test/files/continuations-run/t5314-with-if.scala
new file mode 100644
index 0000000000..5840199a3c
--- /dev/null
+++ b/test/files/continuations-run/t5314-with-if.scala
@@ -0,0 +1,17 @@
+import scala.util.continuations._
+
+object Test extends App {
+
+  def foo(x:Int): Int @cps[Int] = 7
+
+  def bar(x:Int): Int @cps[Int] = {
+    val v = foo(x)
+    if (v > 0)
+      return v
+    else
+      return 10
+  }
+
+  println(reset { bar(10) })
+
+}