1 files changed, 26 insertions, 7 deletions
diff --git a/src/partest-extras/scala/tools/partest/ASMConverters.scala b/src/partest-extras/scala/tools/partest/ASMConverters.scala
index b4c686473b..445d3c89c2 100644
--- a/src/partest-extras/scala/tools/partest/ASMConverters.scala
+++ b/src/partest-extras/scala/tools/partest/ASMConverters.scala
@@ -38,6 +38,28 @@ object ASMConverters {
     }
 
     def dropNonOp = dropLinesFrames.dropStaleLabels
+
+    def summary: List[Any] = dropNonOp map {
+      case i: Invoke => i.name
+      case i => i.opcode
+    }
+
+    def summaryText: String = {
+      def comment(i: Instruction) = i match {
+        case j: Jump => s" /*${j.label.offset}*/"
+        case l: Label => s" /*${l.offset}*/"
+        case _ => ""
+      }
+      dropNonOp.map({
+        case i: Invoke => s""""${i.name}""""
+        case ins => opcodeToString(ins.opcode, ins.opcode) + comment(ins)
+      }).mkString("List(", ", ", ")")
+    }
+  }
+
+  def opcodeToString(op: Int, default: Any = "?"): String = {
+    import scala.tools.asm.util.Printer.OPCODES
+    if (OPCODES.isDefinedAt(op)) OPCODES(op) else default.toString
   }
 
   sealed abstract class Instruction extends Product {
@@ -45,12 +67,9 @@ object ASMConverters {
 
     // toString such that the first field, "opcode: Int", is printed textually.
     final override def toString() = {
-      import scala.tools.asm.util.Printer.OPCODES
-      def opString(op: Int) = if (OPCODES.isDefinedAt(op)) OPCODES(op) else "?"
       val printOpcode = opcode != -1
-
       productPrefix + (
-        if (printOpcode) Iterator(opString(opcode)) ++ productIterator.drop(1)
+        if (printOpcode) Iterator(opcodeToString(opcode)) ++ productIterator.drop(1)
         else productIterator
       ).mkString("(", ", ", ")")
     }
@@ -75,7 +94,7 @@ object ASMConverters {
   case class FrameEntry   (`type`: Int, local: List[Any], stack: List[Any])                                   extends Instruction { def opcode: Int = -1 }
   case class LineNumber   (line: Int, start: Label)                                                           extends Instruction { def opcode: Int = -1 }
 
-  case class MethodHandle(tag: Int, owner: String, name: String, desc: String)
+  case class MethodHandle(tag: Int, owner: String, name: String, desc: String, itf: Boolean)
 
   case class ExceptionHandler(start: Label, end: Label, handler: Label, desc: Option[String])
   case class LocalVariable(name: String, desc: String, signature: Option[String], start: Label, end: Label, index: Int)
@@ -128,7 +147,7 @@ object ASMConverters {
       case _ => a // can be: Class, method Type, primitive constant
     })(collection.breakOut)
 
-    private def convertMethodHandle(h: asm.Handle): MethodHandle = MethodHandle(h.getTag, h.getOwner, h.getName, h.getDesc)
+    private def convertMethodHandle(h: asm.Handle): MethodHandle = MethodHandle(h.getTag, h.getOwner, h.getName, h.getDesc, h.isInterface)
 
     private def convertHandlers(method: t.MethodNode): List[ExceptionHandler] = {
       method.tryCatchBlocks.asScala.map(h => ExceptionHandler(applyLabel(h.start), applyLabel(h.end), applyLabel(h.handler), Option(h.`type`)))(collection.breakOut)
@@ -208,7 +227,7 @@ object ASMConverters {
     case x => x.asInstanceOf[Object]
   }
 
-  def unconvertMethodHandle(h: MethodHandle): asm.Handle = new asm.Handle(h.tag, h.owner, h.name, h.desc)
+  def unconvertMethodHandle(h: MethodHandle): asm.Handle = new asm.Handle(h.tag, h.owner, h.name, h.desc, h.itf)
   def unconvertBsmArgs(a: List[Object]): Array[Object] = a.map({
     case h: MethodHandle => unconvertMethodHandle(h)
     case o => o