Fixes and test cases for #2087 and #2400.

fixing a long-standing bug in fjbg and recompiling fjbg.jar, which had
the side effect of revealing that the current fjbg jar had never been
recompiled with target 1.5, so now it's smaller and (I imagine) faster.

1 files changed, 20 insertions, 0 deletions

diff --git a/test/files/run/bugs2087-and-2400.scala b/test/files/run/bugs2087-and-2400.scala
new file mode 100644
index 0000000000..19a5df26e3
--- /dev/null
+++ b/test/files/run/bugs2087-and-2400.scala
@@ -0,0 +1,20 @@
+object Test
+{
+  def negativeCharMaker = new (Short => Char) { def apply(x: Short) = x.toChar }
+  def main(args: Array[String]): Unit = {
+    // throws exception if -100 gets to Character.valueOf
+    val x = negativeCharMaker(-100)
+
+    // chars are unsigned, they should never be equal to negative values
+    assert((-100).toShort != (-100).toChar)
+    assert((-100).toChar != (-100).toShort)
+    assert((-100).toChar != (-100).toByte)
+    assert((-100).toByte != (-100).toChar)
+
+    // BoxesRunTime must agree as well
+    assert(((-100).toShort: Any) != (-100).toChar)
+    assert(((-100).toChar: Any) != (-100).toShort)
+    assert(((-100).toChar: Any) != (-100).toByte)
+    assert(((-100).toByte: Any) != (-100).toChar)
+  }
+}