Merge pull request #10276 from som-snytt/tweak/t7253-broken

scala · Jan 31, 2023 · 0958b82 · 0958b82
2 parents 8d2641e + 25aef2c
commit 0958b82
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/test/files/jvm/t7253.check b/test/files/jvm/t7253.check
diff --git a/test/files/jvm/t7253/test.scala b/test/files/jvm/t7253/test.scala
@@ -1,29 +1,20 @@
-import scala.tools.partest.BytecodeTest
-import scala.tools.testkit.ASMConverters
+// scalac: -Werror -Xlint
 
-import scala.tools.nsc.util.JavaClassPath
-import java.io.InputStream
-import scala.tools.asm
-import asm.ClassReader
-import asm.tree.{ClassNode, InsnList}
-import scala.collection.JavaConverters._
+import scala.tools.asm.Opcodes
+import scala.tools.partest.BytecodeTest
+import scala.tools.testkit.ASMConverters._
 
 object Test extends BytecodeTest {
-  import ASMConverters._
 
-  def show: Unit = {
-    val instrBaseSeqs = Seq("ScalaClient_1", "JavaClient_1") map (name => instructionsFromMethod(getMethod(loadClassNode(name), "foo")))
-    val instrSeqs = instrBaseSeqs map (_ filter isInvoke)
-    cmpInstructions(instrSeqs(0), instrSeqs(1))
+  def show(): Unit = {
+    def fooOf(name: String) = instructionsFromMethod(getMethod(loadClassNode(name), "foo")).filter(isInvoke)
+    cmpInstructions(fooOf("ScalaClient_1"), fooOf("JavaClient_1"))
   }
 
-  def cmpInstructions(isa: List[Instruction], isb: List[Instruction]) = {
-    if (isa == isb) println("bytecode identical")
-    else diffInstructions(isa, isb)
-  }
+  def cmpInstructions(isa: List[Instruction], isb: List[Instruction]) =
+    if (!isa.sameElements(isb))
+      diffInstructions(isa, isb)
 
-  def isInvoke(node: Instruction): Boolean = {
-    val opcode = node.opcode
-    (opcode == "INVOKEVIRTUAL") || (opcode == "INVOKEINTERFACE")
-  }
+  def isInvoke(node: Instruction): Boolean =
+    node.opcode == Opcodes.INVOKEVIRTUAL || node.opcode == Opcodes.INVOKEINTERFACE
 }