Fix virtual invoke tracking in bytecode translator (#4299)

Author: shai-almog

vm/ByteCodeTranslator/src/com/codename1/tools/translator/bytecodes/CustomInvoke.java

@@ -159,6 +159,7 @@ public boolean appendExpression(StringBuilder b) {
         }
 
         StringBuilder bld = new StringBuilder();
+        boolean isVirtualCall = false;
         if(origOpcode == Opcodes.INVOKEINTERFACE || origOpcode == Opcodes.INVOKEVIRTUAL) {
             b.append("    ");
 
@@ -179,6 +180,7 @@ public boolean appendExpression(StringBuilder b) {
             }
             if (isVirtual) {
                 bld.append("virtual_");
+                isVirtualCall = true;
             }
         } else {
             b.append("    ");
@@ -207,6 +209,9 @@ public boolean appendExpression(StringBuilder b) {
         bld.append("__");
         ArrayList<String> args = new ArrayList<String>();
         String returnVal = BytecodeMethod.appendMethodSignatureSuffixFromDesc(desc, bld, args);
+        if (isVirtualCall) {
+            BytecodeMethod.addVirtualMethodsInvoked(bld.substring("virtual_".length()));
+        }
         int numLiteralArgs = this.getNumLiteralArgs();
         if (numLiteralArgs > 0) {
             b.append("/* CustomInvoke */");

vm/ByteCodeTranslator/src/com/codename1/tools/translator/bytecodes/Invoke.java

@@ -142,9 +142,10 @@ public void appendInstruction(StringBuilder b) {
         }
 
         StringBuilder bld = new StringBuilder();
+        boolean isVirtualCall = false;
         if(opcode == Opcodes.INVOKEINTERFACE || opcode == Opcodes.INVOKEVIRTUAL) {
             b.append("    ");
-            
+
             // Well, it is actually legal to call private methods with invoke virtual, and kotlin
             // generates such calls.  But ParparVM strips out these virtual method definitions
             // so we need to check if the method is private, and remove the virtual invocation 
@@ -162,6 +163,7 @@ public void appendInstruction(StringBuilder b) {
             }
             if (isVirtual) {
                 bld.append("virtual_");
+                isVirtualCall = true;
             }
         } else {
             b.append("    ");
@@ -195,6 +197,9 @@ public void appendInstruction(StringBuilder b) {
         bld.append("__");
         ArrayList<String> args = new ArrayList<String>();
         String returnVal = BytecodeMethod.appendMethodSignatureSuffixFromDesc(desc, bld, args);
+        if (isVirtualCall) {
+            BytecodeMethod.addVirtualMethodsInvoked(bld.substring("virtual_".length()));
+        }
         boolean noPop = false;
         if(returnVal == null) {
             b.append(bld);