File tree 1 file changed +7
-6
lines changed
Ghidra/Features/Base/src/main/java/ghidra/program/util
1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -381,16 +381,17 @@ private static String determineCallingConventionName(Function destinationFunctio
381
381
return sourceConv ;
382
382
}
383
383
boolean applyConventionName = sameLanguageAndCompilerSpec ;
384
- if (applyConventionName ) {
384
+ String callingConvention = sourceFunction .getCallingConventionName ();
385
+ if (applyConventionName &&
386
+ !CompilerSpec .CALLING_CONVENTION_default .equals (callingConvention )) {
385
387
DataTypeManager dtMgr = destinationFunction .getProgram ().getDataTypeManager ();
386
- String name = destinationFunction .getCallingConventionName ();
387
- if (GenericCallingConvention
388
- .getGenericCallingConvention (name ) == GenericCallingConvention .unknown &&
389
- !dtMgr .getKnownCallingConventionNames ().contains (name )) {
388
+ if (GenericCallingConvention .getGenericCallingConvention (
389
+ callingConvention ) == GenericCallingConvention .unknown &&
390
+ !dtMgr .getKnownCallingConventionNames ().contains (callingConvention )) {
390
391
applyConventionName = false ;
391
392
}
392
393
}
393
- return applyConventionName ? sourceFunction . getCallingConventionName ()
394
+ return applyConventionName ? callingConvention
394
395
: destinationFunction .getCallingConventionName ();
395
396
}
396
397
You can’t perform that action at this time.
0 commit comments