Add previous bytecode lines check

Author: nicolasstucki

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

@@ -101,6 +101,159 @@ class InlineBytecodeTests extends DottyBytecodeTest {
     }
   }
 
+  @Test def i4947a = {
+    val source = """class Foo {
+                   |  inline def fact[T](inline i: Int)(f: => T): Int = {
+                   |    printStack("track", i) // line 3
+                   |    printStack("track", i) // line 4
+                   |    f
+                   |    if (i == 0)
+                   |      1 // line 7
+                   |    else {
+                   |      i * fact(i-1)(f) // line 9
+                   |    }
+                   |  }
+                   |
+                   |  def printStack(tag: String, i: Int): Unit = { // line 13
+                   |    println(s"$tag (i = $i): ${new Exception().getStackTrace().apply(1)}") // line 14
+                   |  }
+                   |
+                   |  def main(args: Array[String]): Unit = {
+                   |    fact(0) { // line 18
+                   |      fact(2) { // line 19
+                   |        printStack("main1", -1) // line 20
+                   |        printStack("main2", -1) // line 21
+                   |      }
+                   |    } // line 23
+                   |  }
+                   |}
+                 """.stripMargin
+
+    checkBCode(source) { dir =>
+      val clsIn      = dir.lookupName("Foo.class", directory = false).input
+      val clsNode    = loadClassNode(clsIn, skipDebugInfo = false)
+
+      val track = clsNode.methods.asScala.find(_.name == "fact")
+      assert(track.isEmpty, "method `fact` should have been erased")
+
+      val main = getMethod(clsNode, "main")
+      val instructions = instructionsFromMethod(main)
+      val expected =
+        List(
+          Label(0),
+          LineNumber(17, Label(0)),
+          LineNumber(3, Label(0)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "track"),
+          Op(ICONST_0),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(7),
+          LineNumber(4, Label(7)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "track"),
+          Op(ICONST_0),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(13),
+          LineNumber(3, Label(13)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "track"),
+          Op(ICONST_2),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(19),
+          LineNumber(4, Label(19)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "track"),
+          Op(ICONST_2),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(25),
+          LineNumber(20, Label(25)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "main1"),
+          Op(ICONST_M1),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(31),
+          LineNumber(21, Label(31)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "main2"),
+          Op(ICONST_M1),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(37),
+          LineNumber(9, Label(37)),
+          Op(ICONST_2),
+          Label(40),
+          LineNumber(3, Label(40)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "track"),
+          Op(ICONST_1),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(46),
+          LineNumber(4, Label(46)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "track"),
+          Op(ICONST_1),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(52),
+          LineNumber(20, Label(52)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "main1"),
+          Op(ICONST_M1),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(58),
+          LineNumber(21, Label(58)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "main2"),
+          Op(ICONST_M1),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(64),
+          LineNumber(9, Label(64)),
+          Op(ICONST_1),
+          Label(67),
+          LineNumber(3, Label(67)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "track"),
+          Op(ICONST_0),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(73),
+          LineNumber(4, Label(73)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "track"),
+          Op(ICONST_0),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(79),
+          LineNumber(20, Label(79)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "main1"),
+          Op(ICONST_M1),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(85),
+          LineNumber(21, Label(85)),
+          VarOp(ALOAD, 0),
+          Ldc(LDC, "main2"),
+          Op(ICONST_M1),
+          Invoke(INVOKEVIRTUAL, "Foo", "printStack", "(Ljava/lang/String;I)V", false),
+          Label(91),
+          LineNumber(7, Label(91)),
+          Op(ICONST_1),
+          Op(IMUL),
+          Label(95),
+          LineNumber(9, Label(95)),
+          Op(IMUL),
+          Op(POP),
+          Label(99),
+          LineNumber(7, Label(99)),
+          Op(ICONST_1),
+          Op(POP),
+          Label(103),
+          LineNumber(23, Label(103)),
+          Op(RETURN),
+          Label(106)
+        )
+      assert(instructions == expected,
+        "`track` was not properly inlined in `main`\n" + diffInstructions(instructions, expected))
+
+    }
+  }
+
   @Test def i4947b = {
     val source = """class Foo {
                    |  inline def track2[T](f: => T) <: T = {