WIP

Author: HarrisL2

compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala

@@ -221,33 +221,35 @@ trait BCodeHelpers extends BCodeIdiomatic {
         val av = cw.visitAnnotation(typeDescriptor(typ), isRuntimeVisible(annot))
         emitAssocs(av, assocs, BCodeHelpers.this)(this)
       }
-    
-    def toJTypeB(tpe: dotty.tools.dotc.transform.TypeB): TypeHints.TypeB = 
+
+    def toJTypeB(tpe: dotty.tools.dotc.transform.TypeB): TypeHints.TypeB =
       tpe match
         case dotty.tools.dotc.transform.TypeB.None => TypeHints.TypeB.NO_HINT
         case dotty.tools.dotc.transform.TypeB.M(index) => new TypeHints.TypeB(TypeHints.TypeB.M_KIND, index)
+        case dotty.tools.dotc.transform.TypeB.K(index) => ???
         // case _ =>
         //   report.error("unexpected type in to Java TypeB: " + tpe)
         //   TypeHints.TypeB.NO_HINT // fallback, should not happen
 
-    def addMethodTypeParameterCountAttribute(mw: asm.MethodVisitor, count: Int): Unit = 
+    def addMethodTypeParameterCountAttribute(mw: asm.MethodVisitor, count: Int): Unit =
       if (count > 0){
         val attr = new MethodTypeParameterCount(count)
         mw.visitAttribute(attr)
       }
 
     def addMethodReturnTypeAttribute(mw: asm.MethodVisitor, tpe: dotty.tools.dotc.transform.TypeB): Unit =
-      tpe match 
-        case dotty.tools.dotc.transform.TypeB.M(index) => 
+      tpe match
+        case dotty.tools.dotc.transform.TypeB.M(index) =>
           val typeB = new TypeHints.TypeB(TypeHints.TypeB.M_KIND, index)
           val attr = new MethodReturnType(typeB)
           mw.visitAttribute(attr)
         case dotty.tools.dotc.transform.TypeB.None => //do nothing
+        case dotty.tools.dotc.transform.TypeB.K(index) => ???
         // case _ =>
         //   report.error("Unexpected type for method return type attribute: " + tpe)
-      
 
-    def addMethodParameterTypeAttribute(mw: asm.MethodVisitor, lst: List[dotty.tools.dotc.transform.TypeB]) : Unit = 
+
+    def addMethodParameterTypeAttribute(mw: asm.MethodVisitor, lst: List[dotty.tools.dotc.transform.TypeB]) : Unit =
         if (lst.isEmpty) return
         val lstJTypeB = lst.map(toJTypeB)
         val len = lstJTypeB.length

compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala

@@ -426,12 +426,13 @@ trait BCodeIdiomatic {
       emitInvoke(Opcodes.INVOKEVIRTUAL, owner, name, desc, itf = false)
     }
 
-    def toJTypeB(tpe: dotty.tools.dotc.transform.TypeB): TypeHints.TypeB = 
+    def toJTypeB(tpe: dotty.tools.dotc.transform.TypeB): TypeHints.TypeB =
       tpe match
         case dotty.tools.dotc.transform.TypeB.None => TypeHints.TypeB.NO_HINT
         case dotty.tools.dotc.transform.TypeB.M(index) => new TypeHints.TypeB(TypeHints.TypeB.M_KIND, index)
+        case _ => ???
 
-    def toJTypeA(tpe: dotty.tools.dotc.transform.TypeA): TypeHints.TypeA = 
+    def toJTypeA(tpe: dotty.tools.dotc.transform.TypeA): TypeHints.TypeA =
       tpe match
         case dotty.tools.dotc.transform.TypeA.Byte => TypeHints.TypeA.TYPEA_BYTE
         case dotty.tools.dotc.transform.TypeA.Char => TypeHints.TypeA.TYPEA_CHAR
@@ -444,9 +445,9 @@ trait BCodeIdiomatic {
         case dotty.tools.dotc.transform.TypeA.M(x) => TypeHints.TypeA(TypeHints.TypeA.M_KIND, x)
         case dotty.tools.dotc.transform.TypeA.K(x) => TypeHints.TypeA(TypeHints.TypeA.K_KIND, x)
         case dotty.tools.dotc.transform.TypeA.Ref => TypeHints.TypeA.TYPEA_REFERENCE
-      
 
-    def emitInvoke(opcode: Int, owner: String, name: String, desc: String, itf: Boolean, 
+
+    def emitInvoke(opcode: Int, owner: String, name: String, desc: String, itf: Boolean,
                    invokeReturnType : Option[dotty.tools.dotc.transform.TypeB] = None, instrTypeArgs : Option[List[dotty.tools.dotc.transform.TypeA]] = None): Unit = {
       val node = new MethodInsnNode(opcode, owner, name, desc, itf)
       jmethod.instructions.add(node)