GP-5216 Correct BSim signature apply bug

NationalSecurityAgency · Dec 21, 2024 · dacc9b2 · dacc9b2
1 parent d3e34f9
commit dacc9b2
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/FunctionUtility.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/FunctionUtility.java
@@ -381,16 +381,17 @@ private static String determineCallingConventionName(Function destinationFunctio
 			return sourceConv;
 		}
 		boolean applyConventionName = sameLanguageAndCompilerSpec;
-		if (applyConventionName) {
+		String callingConvention = sourceFunction.getCallingConventionName();
+		if (applyConventionName &&
+			!CompilerSpec.CALLING_CONVENTION_default.equals(callingConvention)) {
 			DataTypeManager dtMgr = destinationFunction.getProgram().getDataTypeManager();
-			String name = destinationFunction.getCallingConventionName();
-			if (GenericCallingConvention
-					.getGenericCallingConvention(name) == GenericCallingConvention.unknown &&
-				!dtMgr.getKnownCallingConventionNames().contains(name)) {
+			if (GenericCallingConvention.getGenericCallingConvention(
+				callingConvention) == GenericCallingConvention.unknown &&
+				!dtMgr.getKnownCallingConventionNames().contains(callingConvention)) {
 				applyConventionName = false;
 			}
 		}
-		return applyConventionName ? sourceFunction.getCallingConventionName()
+		return applyConventionName ? callingConvention
 				: destinationFunction.getCallingConventionName();
 	}