Update BytecodeTest / CallGraphTest

Author: retronym

test/junit/scala/issues/BytecodeTest.scala

@@ -12,6 +12,7 @@ import org.junit.Assert._
 import scala.collection.JavaConverters._
 import scala.tools.asm.Opcodes
 import scala.tools.asm.tree.ClassNode
+import scala.tools.nsc.backend.jvm.opt.BytecodeUtils
 import scala.tools.partest.ASMConverters._
 import scala.tools.testing.ClearAfterClass
 
@@ -221,7 +222,7 @@ class BytecodeTest extends ClearAfterClass {
 
     def checkForwarder(c: ClassNode, target: String) = {
       val List(f) = findMethods(c, "f")
-      assertSameCode(f, List(VarOp(ALOAD, 0), Invoke(INVOKESPECIAL, target, "f", "()I", false), Op(IRETURN)))
+      assertSameCode(f, List(VarOp(ALOAD, 0), Invoke(INVOKESTATIC, target, "f", s"(L$target;)I", false), Op(IRETURN)))
     }
   }
 
@@ -347,7 +348,7 @@ class BytecodeTest extends ClearAfterClass {
   def invocationReceivers(): Unit = {
     val List(c1, c2, t, u) = compileClasses(compiler)(invocationReceiversTestCode.definitions("Object"))
     // mixin forwarder in C1
-    assertSameCode(getSingleMethod(c1, "clone"), List(VarOp(ALOAD, 0), Invoke(INVOKESPECIAL, "T", "clone", "()Ljava/lang/Object;", false), Op(ARETURN)))
+    assertSameCode(getSingleMethod(c1, "clone"), List(VarOp(ALOAD, 0), Invoke(INVOKESTATIC, "T", "clone", "(LT;)Ljava/lang/Object;", false), Op(ARETURN)))
     assertInvoke(getSingleMethod(c1, "f1"), "T", "clone")
     assertInvoke(getSingleMethod(c1, "f2"), "T", "clone")
     assertInvoke(getSingleMethod(c1, "f3"), "C1", "clone")
@@ -356,8 +357,8 @@ class BytecodeTest extends ClearAfterClass {
     assertInvoke(getSingleMethod(c2, "f3"), "C1", "clone")
 
     val List(c1b, c2b, tb, ub) = compileClasses(compiler)(invocationReceiversTestCode.definitions("String"))
-    def ms(c: ClassNode, n: String) = c.methods.asScala.toList.filter(_.name == n)
-    assert(ms(tb, "clone").length == 1)
+    def ms(c: ClassNode, n: String) = c.methods.asScala.toList.filter(_.name == n).filterNot(BytecodeUtils.isStaticMethod)
+    assert(ms(tb, "clone").length == 1, tb.methods.asScala.map(_.name))
     assert(ms(ub, "clone").isEmpty)
     val List(c1Clone) = ms(c1b, "clone")
     assertEquals(c1Clone.desc, "()Ljava/lang/Object;")

test/junit/scala/tools/nsc/backend/jvm/opt/CallGraphTest.scala

@@ -5,6 +5,7 @@ package opt
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.junit.Test
+
 import scala.collection.generic.Clearable
 import scala.collection.immutable.IntMap
 import scala.tools.asm.Opcodes._
@@ -14,14 +15,13 @@ import scala.tools.asm.tree._
 import scala.tools.asm.tree.analysis._
 import scala.tools.nsc.reporters.StoreReporter
 import scala.tools.testing.AssertUtil._
-
 import CodeGenTools._
 import scala.tools.partest.ASMConverters
 import ASMConverters._
 import AsmUtils._
 import BackendReporting._
-
 import scala.collection.JavaConverters._
+import scala.tools.nsc.backend.jvm.opt.BytecodeUtils.isStaticMethod
 import scala.tools.testing.ClearAfterClass
 
 object CallGraphTest extends ClearAfterClass.Clearable {
@@ -191,7 +191,7 @@ class CallGraphTest extends ClearAfterClass {
     val t3h = callIn("t3")
     assertEquals(t3h.argInfos.toList, List((1, FunctionLiteral)))
 
-    val selfSamCall = callIn("selfSamCall")
+    val selfSamCall = callGraph.callsites.filter(_._1.name == "selfSamCall").filter(x => isStaticMethod(x._1)).values.head.values.head
     assertEquals(selfSamCall.argInfos.toList, List((0,ForwardedParam(0))))
   }