Fix tests

Author: odersky

tests/neg/harmonize.scala

@@ -53,17 +53,17 @@ object Test {
   inline val b = 33
   def f(): Int = b + 1
   val a1 = Array(b, 33, 'a')
-  val b1: Array[Int] = a1    // error: no widening
+  val b1: Array[Int] = a1    // OK, Array constructor selection uses weak conformance
   val a2 = Array(b, 33, 'a', f())
-  val b2: Array[Int] = a2    // error: no widening
+  val b2: Array[Int] = a2    // OK, Array constructor selection uses weak conformance
   val a3 = Array(1.0f, 'a', 0)
-  val b3: Array[Float] = a3  // error: no widening
+  val b3: Array[Float] = a3  // OK, Array constructor selection uses weak conformance
   val a4 = Array(1.0f, 1L)
-  val b4: Array[Double] = a4 // error: no widening
+  val b4: Array[Double] = a4 // error: Array[Float] is picked
   val a5 = Array(1.0f, 1L, f())
-  val b5: Array[AnyVal] = a5
+  val b5: Array[AnyVal] = a5 // error: Array[Float] is picked
   val a6 = Array(1.0f, 1234567890)
-  val b6: Array[AnyVal] = a6
+  val b6: Array[AnyVal] = a6 // error: Array[Float] is picked
 
   def totalDuration(results: List[Long], cond: Boolean): Long =
     results.map(r => if (cond) r else 0).sum

tests/run/weak-conformance.scala

@@ -21,15 +21,17 @@ object Test extends App {
   }
 
   locally {
+    // Arrays behave differently from lists since they have overloaded constructors, and weak
+    // conformance does apply for selecting one. See Issue #7630.
     def f(): Int = b + 1
-    val x1 = Array(b, 33, 5.5)      ; x1: Array[Double] // b is an inline val
-    val x2 = Array(f(), 33, 5.5)    ; x2: Array[AnyVal] // f() is not a constant
+    val x1 = Array(b, 33, 5.5)      ; x1: Array[Double]
+    val x2 = Array(f(), 33, 5.5)    ; x2: Array[Double]
     val x3 = Array(5, 11L)          ; x3: Array[Long]
-    val x4 = Array(5, 11L, 5.5)     ; x4: Array[AnyVal] // Long and Double found
+    val x4 = Array(5, 11L, 5.5)     ; x4: Array[Double]
     val x5 = Array(1.0f, 2)         ; x5: Array[Float]
-    val x6 = Array(1.0f, 1234567890); x6: Array[AnyVal] // loss of precision
-    val x7 = Array(b, 33, 'a')      ; x7: Array[Char]
-    val x8 = Array(5.toByte, 11)    ; x8: Array[Byte]
+    val x6 = Array(1.0f, 1234567890); x6: Array[Float]
+    val x7 = Array(b, 33, 'a')      ; x7: Array[Int]
+    val x8 = Array(5.toByte, 11)    ; x8: Array[Int]
 
     val x9: Array[AnyVal] = Array(1.0f, 0)
     assert(x9(0).getClass == classOf[java.lang.Float])