Merge pull request #3462 from retronym/ticket/8233

SI-8233 Fix regression in backend with boxed nulls

3 files changed, 37 insertions, 0 deletions

diff --git a/test/files/run/t8233-bcode.flags b/test/files/run/t8233-bcode.flags
new file mode 100644
index 0000000000..c30091d3de
--- /dev/null
+++ b/test/files/run/t8233-bcode.flags
@@ -0,0 +1 @@
+-Ybackend:GenBCode
diff --git a/test/files/run/t8233-bcode.scala b/test/files/run/t8233-bcode.scala
new file mode 100644
index 0000000000..fae1c2b702
--- /dev/null
+++ b/test/files/run/t8233-bcode.scala
@@ -0,0 +1,18 @@
+object Test {
+  def bar(s: String) = s;
+  val o: Option[Null] = None
+  def nullReference {
+    val a: Null = o.get
+    bar(a) // Was: VerifyError under GenICode
+  }
+
+  def literal {
+    val a: Null = null
+    bar(a)
+  }
+
+  def main(args: Array[String]) = {
+    try { nullReference } catch { case _: NoSuchElementException => }
+    literal
+  }
+}
diff --git a/test/files/run/t8233.scala b/test/files/run/t8233.scala
new file mode 100644
index 0000000000..fae1c2b702
--- /dev/null
+++ b/test/files/run/t8233.scala
@@ -0,0 +1,18 @@
+object Test {
+  def bar(s: String) = s;
+  val o: Option[Null] = None
+  def nullReference {
+    val a: Null = o.get
+    bar(a) // Was: VerifyError under GenICode
+  }
+
+  def literal {
+    val a: Null = null
+    bar(a)
+  }
+
+  def main(args: Array[String]) = {
+    try { nullReference } catch { case _: NoSuchElementException => }
+    literal
+  }
+}