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

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -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;
} }