Decompiler: Fix inlining for call_return override #8561
+25
−6
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, when decompiling a function with a call to an inlined function that is the result of a call_return flow override, the inline would fail with a
Return address prevents inlining herewarning. This was due to an overly restrictive check inFlowInfo::testHardInlineRestrictions. With this PR applied, these function calls are inlined again.This PR also allows
CALLpcode-ops in EZ model functions, sinceCALLoperations don't end basic blocks. This also significantly improves Ghidra's ability to inline functions with function calls inside (such as those generated by the call_return override).This PR also makes the warning more explicit on why the return address prevents inlining.
Sample
FUN_a7d3fb00_ret_addr_prevents_inline.xml (manually edited to ensure the flow overrides are assigned to the correct function).
Before
Decompiler output without this PR applied:
After
Decompiler output with this PR applied: