Merge remote-tracking branch 'origin/patch'

This commit is contained in:
Ryan Kurtz 2023-05-26 11:45:59 -04:00
commit 47457bef53

View file

@ -31,6 +31,8 @@ import ghidra.program.model.lang.*;
import ghidra.program.model.listing.Function;
import ghidra.program.model.listing.Program;
import ghidra.program.model.pcode.*;
import ghidra.program.model.symbol.IdentityNameTransformer;
import ghidra.program.model.symbol.NameTransformer;
import ghidra.util.Msg;
import ghidra.util.task.CancelledListener;
import ghidra.util.task.TaskMonitor;
@ -370,7 +372,9 @@ public class DecompInterface {
}
compilerSpec = spec;
dtmanage = new PcodeDataTypeManager(prog, options.getNameTransformer());
NameTransformer transformer =
(options == null) ? new IdentityNameTransformer() : options.getNameTransformer();
dtmanage = new PcodeDataTypeManager(prog, transformer);
try {
decompCallback =
new DecompileCallback(prog, pcodelanguage, program.getCompilerSpec(), dtmanage);