Merge remote-tracking branch

'origin/GP-4792_James_adjust_call_convention_analyzer' into patch
This commit is contained in:
Ryan Kurtz
2024-08-05 11:12:26 -04:00

View File

@@ -216,7 +216,7 @@ public class DecompilerCallConventionAnalyzer extends AbstractAnalyzer {
continue; continue;
} }
if (hasImportedSignatureWithinNamespace(function) || if (hasNonDefaultSignatureWithinNamespace(function) ||
hasDefinedParameterTypes(function)) { hasDefinedParameterTypes(function)) {
functionEntries.add(function.getEntryPoint()); functionEntries.add(function.getEntryPoint());
} }
@@ -225,8 +225,8 @@ public class DecompilerCallConventionAnalyzer extends AbstractAnalyzer {
return functionEntries; return functionEntries;
} }
private boolean hasImportedSignatureWithinNamespace(Function function) { private boolean hasNonDefaultSignatureWithinNamespace(Function function) {
return function.getSignatureSource() == SourceType.IMPORTED && return function.getSignatureSource() != SourceType.DEFAULT &&
function.getParentNamespace().getID() != Namespace.GLOBAL_NAMESPACE_ID; function.getParentNamespace().getID() != Namespace.GLOBAL_NAMESPACE_ID;
} }