Fix BTypes.LONG.maxValueType(BTypes.FLOAT)

The result must be BTypes.FLOAT instead of BTypes.DOUBLE.

This implementation incorporates the suggestion at
scala#7435 (review).

It also adds unit tests for BTypes.LONG receivers of this method.

Author: GreenRecycleBin

src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala

@@ -297,7 +297,7 @@ abstract class BTypes {
 
         case LONG =>
           if (other.isIntegralType)  LONG
-          else if (other.isRealType) DOUBLE
+          else if (other.isRealType) other
           else                       uncomparable
 
         case FLOAT =>

test/junit/scala/tools/nsc/backend/jvm/BTypesTest.scala

@@ -19,7 +19,8 @@ class BTypesTest extends BytecodeTesting {
   }
   import global.genBCode.bTypes._
 
-  def classBTFS(sym: global.Symbol) = global.exitingDelambdafy(classBTypeFromSymbol(sym))
+  def duringBackend[T](f: => T) = global.exitingDelambdafy(f)
+  def classBTFS(sym: global.Symbol) = duringBackend { classBTypeFromSymbol(sym) }
 
   def jlo = global.definitions.ObjectClass
   def jls = global.definitions.StringClass
@@ -221,4 +222,30 @@ class BTypesTest extends BytecodeTesting {
   def maxTypeTest() {
 
   }
+
+  @Test
+  def maxValueTypeATest(): Unit = duringBackend {
+    assertEquals(LONG, LONG.maxValueType(BYTE))
+    assertEquals(LONG, LONG.maxValueType(SHORT))
+    assertEquals(LONG, LONG.maxValueType(CHAR))
+    assertEquals(LONG, LONG.maxValueType(INT))
+    assertEquals(LONG, LONG.maxValueType(LONG))
+    assertEquals(FLOAT, LONG.maxValueType(FLOAT))
+    assertEquals(DOUBLE, LONG.maxValueType(DOUBLE))
+
+    assertUncomparable(LONG, UNIT)
+    assertUncomparable(LONG, BOOL)
+    assertUncomparable(LONG, o)
+    assertUncomparable(LONG, s)
+    assertUncomparable(LONG, oArr)
+    assertUncomparable(LONG, method)
+
+    def assertUncomparable(t1: PrimitiveBType, t2: BType): Unit = {
+      try {
+        t1.maxValueType(t2)
+      } catch {
+        case e: AssertionError => assertEquals(s"Cannot compute maxValueType: $t1, $t2", e.getMessage)
+      }
+    }
+  }
 }