More more precise tests

Author: SolalPirelli

compiler/test/dotty/tools/backend/jvm/OptimizationBytecodeTests.scala

@@ -668,14 +668,19 @@ class OptimizationBytecodeTests extends DottyBytecodeTest {
     )
 
   @Test def cleanArrayMapInPlaceVal =
-    assertNoCalls(
-      "(a: Array[Int]) = a.mapInPlace(_ + 1)"
+    testEquivalence(
+      "var i = 0; while i < a.length do { val temp = a(i) + 1; a(i) = temp; i += 1 }; a",
+      "a.mapInPlace(_ + 1)",
+      params = List("a: Array[Int]"),
+      returnType = "Array[Int]"
     )
 
   @Test def cleanArrayMapInPlaceRef =
-    assertNoCallsExcept(
-      "(a: Array[String]) = a.mapInPlace(_.trim)",
-      Set("trim")
+    testEquivalence(
+      "var i = 0; while i < a.length do { var temp = a(i).trim; a(i) = temp; temp = null; i += 1 }; a",
+      "a.mapInPlace(_.trim)",
+      params = List("a: Array[String]"),
+      returnType = "Array[String]"
     )
 
   @Test def cleanArrayCountVal =
@@ -696,25 +701,28 @@ class OptimizationBytecodeTests extends DottyBytecodeTest {
 
 
   @Test def inlineSingleAbstractMethod =
-    assertNoCalls(
-      "(i: Impl) = i.foo()",
+    testEquivalence(
+      "if i eq null then throw null; 42",
+      "i.foo()",
+      params = List("i: Impl"),
       extraMemberSources = List(
         "abstract class SAM { def foo(): Int }",
         "final class Impl extends SAM { def foo() = 42 }"
       )
     )
 
   @Test def inlineSingleAbstractMethodLambda =
-    assertNoCalls(
-      "() = call(n => n + 1)",
+    testEquivalence(
+      "{ val a = 9; a + 1 } + { val b = 31; b + 1 }",
+      "call(n => n + 1)",
       extraMemberSources = List(
         "trait MyIntFunction { def foo(n: Int): Int }",
         "def call(f: MyIntFunction): Int = f.foo(9) + f.foo(31)"
       )
     )
 
 
-  // Regression tes for bugs found during optimizer development
+  // Regression tests for bugs found during optimizer development
 
   @Test def inlinedForeachBodyNotLost = {
     val source =