Add debug flag and adjust list access

Author: HarrisL2

compiler/src/dotty/tools/backend/jvm/MethodNode1.java

@@ -66,7 +66,7 @@ public MethodNode1() {
     }
 
     public void genOffsetMap(){
-        if (!offsetMap.isEmpty()) {
+        if (!offsetMap.isEmpty() && DEBUG) {
             System.out.println("already non empty");
             return;
         }
@@ -349,7 +349,7 @@ public void genOffsetMap(){
     }
 
     public void printOffsetMap() {
-        if (invokeReturnTypeBs.isEmpty() || instructionTypeArgTypeAs.isEmpty()) {
+        if (invokeReturnTypeBs.isEmpty() || instructionTypeArgTypeAs.isEmpty() || !DEBUG) {
             return;
         }
         System.out.println("for method " + name + " offsetMap:");
@@ -362,7 +362,7 @@ public void printOffsetMap() {
     }
 
     public void printInvokeReturnTypeBs(){
-        if (invokeReturnTypeBs.isEmpty()) {
+        if (invokeReturnTypeBs.isEmpty() &&!DEBUG) {
             return;
         }
         System.out.println("for method " + name + " invokeReturnTypeBs:");
@@ -374,7 +374,7 @@ public void printInvokeReturnTypeBs(){
     }
 
     public void printInstructionTypeArgTypeAs(){
-        if (instructionTypeArgTypeAs.isEmpty()) {
+        if (instructionTypeArgTypeAs.isEmpty() || !DEBUG) {
             return;
         }
         System.out.println("for method " + name + " instructionTypeArgTypeAs:");
@@ -408,7 +408,7 @@ public void setAttribtues(){
         }
         if (typeBHintList.size() != 0){
             this.invokeReturnTypeAttribute = new InvokeReturnType(typeBHintList.size(), typeBHintList);
-            System.out.println("invokeReturnTypeAttribute: " + invokeReturnTypeAttribute);
+            if (DEBUG) System.out.println("invokeReturnTypeAttribute: " + invokeReturnTypeAttribute);
             visitAttribute(invokeReturnTypeAttribute);
         }
         List<TypeHints.TypeAHint> typeAHintList = new ArrayList<>();
@@ -425,7 +425,7 @@ public void setAttribtues(){
         }
         if (typeAHintList.size() != 0){
             this.instructionTypeArgumentsAttribute = new InstructionTypeArguments(typeAHintList);
-            System.out.println("instructionTypeArgumentsAttribute: " + instructionTypeArgumentsAttribute);
+            if (DEBUG) System.out.println("instructionTypeArgumentsAttribute: " + instructionTypeArgumentsAttribute);
             visitAttribute(instructionTypeArgumentsAttribute);
         }
 

compiler/src/dotty/tools/dotc/transform/ErasurePreservation.scala

@@ -42,14 +42,17 @@ class ErasurePreservation extends MiniPhase {
       if tr.isRef(defn.BooleanClass) then TypeA.Boolean else
       if tr.symbol.isTypeParam then
         def search(tr: TypeRef, depth: Int, outers: List[List[Symbol]]): TypeA =
-          outers.head.indexOf(tr.symbol) match
-            case -1 =>
-              search(tr, depth+1, outers.tail)
-            case ind =>
-              if depth != 0 then
-                TypeA.K(depth-1, ind)
-              else
-                TypeA.M(ind)
+          outers.headOption match
+            case Some(value) => value.indexOf(tr.symbol) match
+              case -1 =>
+                search(tr, depth+1, outers.tail)
+              case ind =>
+                if depth != 0 then
+                  TypeA.K(depth-1, ind)
+                else
+                  TypeA.M(ind)
+            case None =>
+              TypeA.Ref
         search(tr, 0, outers)
       else TypeA.Ref
     case _ =>
@@ -70,17 +73,19 @@ class ErasurePreservation extends MiniPhase {
       TypeB.M(outers.head.indexWhere(sym => sym.name == tpr.paramName))
     case tr: TypeRef if tr.symbol.isTypeParam =>
       def search(tr: TypeRef, depth: Int, outers: List[List[Symbol]]): TypeB =
-        outers.head.indexOf(tr.symbol) match
-          case -1 =>
-            search(tr, depth+1, outers.tail)
-          case ind =>
-            if depth != 0 then
-              if isConstructor then
-                TypeB.K(depth, ind)
+        outers.headOption match
+          case Some(value) => value.indexOf(tr.symbol) match
+            case -1 =>
+              search(tr, depth+1, outers.tail)
+            case ind =>
+              if depth != 0 then
+                if isConstructor then
+                  TypeB.K(depth, ind)
+                else
+                  TypeB.K(depth-1, ind)
               else
-                TypeB.K(depth-1, ind)
-            else
-              TypeB.M(ind)
+                TypeB.M(ind)
+          case None => TypeB.None
       search(tr, 0, outers)
     case at: AppliedType if at.tycon.isRef(defn.ArrayClass) =>
       TypeB.Array(toTypeB(at.args.head, outers))
@@ -90,14 +95,16 @@ class ErasurePreservation extends MiniPhase {
   def toReturnTypeB(tp: Type, outers: List[List[Symbol]])(using Context): TypeB = tp match
     case tr: TypeRef if tr.symbol.isTypeParam =>
       def search(tr: TypeRef, depth: Int, outers: List[List[Symbol]]): TypeB =
-        outers.head.indexOf(tr.symbol) match
-          case -1 =>
-            search(tr, depth+1, outers.tail)
-          case ind =>
-            if depth != 0 then
-              TypeB.K(depth-1, ind)
-            else
-              TypeB.M(ind)
+        outers.headOption match
+          case Some(value) => value.indexOf(tr.symbol) match
+            case -1 =>
+              search(tr, depth+1, outers.tail)
+            case ind =>
+              if depth != 0 then
+                TypeB.K(depth-1, ind)
+              else
+                TypeB.M(ind)
+          case None => TypeB.None
       search(tr, 0, outers)
     case at: AppliedType if at.tycon.isRef(defn.ArrayClass) =>
       TypeB.Array(toTypeB(at.args.head, outers))