Skip to content

Fix concrete invoke dependency resolution when method context is null #4750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liannacasper merged 2 commits into from
Apr 14, 2026
+19 −13
Merged

Fix concrete invoke dependency resolution when method context is null #4750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f46c741
Fix concrete invoke dependency resolution when method context is unav…
liannacasper Apr 14, 2026
8b09933
Fix concrete invoke resolution regression without method context
liannacasper Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions vm/ByteCodeTranslator/src/com/codename1/tools/translator/bytecodes/CustomInvoke.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public void addDependencies(List<String> dependencyList) {
String dependencyOwner = owner;
if (origOpcode == Opcodes.INVOKEVIRTUAL) {
ByteCodeClass bc = Parser.getClassObject(owner.replace('/', '_').replace('$', '_'));
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc);
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc, true);
if (resolvedConcreteOwner != null) {
dependencyOwner = resolvedConcreteOwner;
}
Expand Down Expand Up @@ -150,13 +150,16 @@ private String findActualOwner(ByteCodeClass bc) {
return findActualOwner(bc.getBaseClassObject());
}

private String resolveConcreteInvokeOwner(ByteCodeClass ownerClass) {
if (ownerClass == null || ownerClass.getConcreteClass() == null || getMethod() == null) {
private String resolveConcreteInvokeOwner(ByteCodeClass ownerClass, boolean allowMissingMethodContext) {
if (ownerClass == null || ownerClass.getConcreteClass() == null) {
return null;
}
String currentClass = getMethod() != null ? getMethod().getClsName() : null;
if (currentClass == null && !allowMissingMethodContext) {
return null;
}
String currentClass = getMethod().getClsName();
String ownerName = ownerClass.getClsName();
if (ownerName.equals(currentClass) || currentClass.startsWith(ownerName + "_")) {
if (currentClass != null && (ownerName.equals(currentClass) || currentClass.startsWith(ownerName + "_"))) {
return null;
}
ByteCodeClass concreteClass = Parser.getClassObject(ownerClass.getConcreteClass().replace('/', '_').replace('$', '_'));
Expand Down Expand Up @@ -209,7 +212,7 @@ public boolean appendExpression(StringBuilder b) {
if (bc.isMethodPrivate(name, desc)) {
isVirtual = false;
} else {
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc);
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc, false);
if (resolvedConcreteOwner != null) {
invokeOwner = resolvedConcreteOwner;
isVirtual = false;
Expand Down Expand Up @@ -320,7 +323,7 @@ public void appendInstruction(StringBuilder b) {
if (bc.isMethodPrivate(name, desc)) {
isVirtual = false;
} else {
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc);
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc, false);
if (resolvedConcreteOwner != null) {
invokeOwner = resolvedConcreteOwner;
isVirtual = false;
Expand Down
15 changes: 9 additions & 6 deletions vm/ByteCodeTranslator/src/com/codename1/tools/translator/bytecodes/Invoke.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void addDependencies(List<String> dependencyList) {
String dependencyOwner = owner;
if (opcode == Opcodes.INVOKEVIRTUAL) {
ByteCodeClass bc = Parser.getClassObject(owner.replace('/', '_').replace('$', '_'));
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc);
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc, true);
if (resolvedConcreteOwner != null) {
dependencyOwner = resolvedConcreteOwner;
}
Expand Down Expand Up @@ -148,13 +148,16 @@ private String findActualOwner(ByteCodeClass bc) {
return findActualOwner(bc.getBaseClassObject());
}

private String resolveConcreteInvokeOwner(ByteCodeClass ownerClass) {
if (ownerClass == null || ownerClass.getConcreteClass() == null || getMethod() == null) {
private String resolveConcreteInvokeOwner(ByteCodeClass ownerClass, boolean allowMissingMethodContext) {
if (ownerClass == null || ownerClass.getConcreteClass() == null) {
return null;
}
String currentClass = getMethod() != null ? getMethod().getClsName() : null;
if (currentClass == null && !allowMissingMethodContext) {
return null;
}
String currentClass = getMethod().getClsName();
String ownerName = ownerClass.getClsName();
if (ownerName.equals(currentClass) || currentClass.startsWith(ownerName + "_")) {
if (currentClass != null && (ownerName.equals(currentClass) || currentClass.startsWith(ownerName + "_"))) {
return null;
}
ByteCodeClass concreteClass = Parser.getClassObject(ownerClass.getConcreteClass().replace('/', '_').replace('$', '_'));
Expand Down Expand Up @@ -194,7 +197,7 @@ public void appendInstruction(StringBuilder b) {
if (bc.isMethodPrivate(name, desc)) {
isVirtual = false;
} else {
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc);
String resolvedConcreteOwner = resolveConcreteInvokeOwner(bc, false);
if (resolvedConcreteOwner != null) {
invokeOwner = resolvedConcreteOwner;
isVirtual = false;
Expand Down
Loading