Merge branch 'master' into fix-equality

2 files changed, 20 insertions, 0 deletions

diff --git a/tests/neg/tailcall/i1221.scala b/tests/neg/tailcall/i1221.scala
new file mode 100644
index 000000000..7cf9312f5
--- /dev/null
+++ b/tests/neg/tailcall/i1221.scala
@@ -0,0 +1,10 @@
+import annotation.tailrec
+
+object I1221{
+  final def foo(a: Int): Int = {
+  if ((foo(a - 1): @tailrec) > 0) // error: not in tail position
+    foo(a - 1): @tailrec
+  else
+    foo(a - 2): @tailrec
+  }
+}
diff --git a/tests/neg/tailcall/i1221b.scala b/tests/neg/tailcall/i1221b.scala
new file mode 100644
index 000000000..f8e2add9a
--- /dev/null
+++ b/tests/neg/tailcall/i1221b.scala
@@ -0,0 +1,10 @@
+import annotation.tailrec
+
+class Test {
+  def foo(a: Int): Int = { // error: method is not final
+    if ((foo(a - 1): @tailrec) > 0)
+      foo(a - 1): @tailrec
+    else
+      foo(a - 2): @tailrec
+    }
+}