Fixed a recursive inling bug, added a test for it #666
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
antoyo
reviewed
May 9, 2025
FractalFir
force-pushed
the
master
branch
2 times, most recently
from
6259a7d to
f217230
Compare
antoyo
reviewed
May 10, 2025
Comment on lines
+43
to
+44
| } | ||
| /// Get GCC attribute for the provided inline heuristic, attached to `instance`. |
There was a problem hiding this comment.
Suggested change
| } | |
| /// Get GCC attribute for the provided inline heuristic, attached to `instance`. | |
| } | |
| /// Get GCC attribute for the provided inline heuristic, attached to `instance`. |
Comment on lines
+12
to
+13
| use mini_core::*; | ||
| #[inline(always)] |
There was a problem hiding this comment.
Suggested change
| use mini_core::*; | |
| #[inline(always)] | |
| use mini_core::*; | |
| #[inline(always)] |
Comment on lines
+22
to
+23
| } | ||
| #[inline(always)] |
There was a problem hiding this comment.
Suggested change
| } | |
| #[inline(always)] | |
| } | |
| #[inline(always)] |
Comment on lines
+32
to
+33
| } | ||
| #[inline(always)] |
There was a problem hiding this comment.
Suggested change
| } | |
| #[inline(always)] | |
| } | |
| #[inline(always)] |
Comment on lines
+42
to
+43
| } | ||
| #[no_mangle] |
There was a problem hiding this comment.
Suggested change
| } | |
| #[no_mangle] | |
| } | |
| #[no_mangle] |
| use rustc_middle::ty; | ||
|
|
||
| use crate::context::CodegenCx; | ||
| use crate::gcc_util::to_gcc_features; | ||
|
|
||
| /// Get GCC attribute for the provided inline heuristic. | ||
| /// Checks if the function `instance` is recursively inline. | ||
| /// Returns `false` if a functions is guranteed to be non-recursive, and `true` if it *might* be recursive. |
There was a problem hiding this comment.
Suggested change
| /// Returns `false` if a functions is guranteed to be non-recursive, and `true` if it *might* be recursive. | |
| /// Returns `false` if a functions is guaranteed to be non-recursive, and `true` if it *might* be recursive. |
| let body = cx.tcx.optimized_mir(instance.def_id()); | ||
| for block in body.basic_blocks.iter() { | ||
| let Some(ref terminator) = block.terminator else { continue }; | ||
| // I assmume that the resursive-inline issue applies only to functions, and not to drops. |
There was a problem hiding this comment.
Suggested change
| // I assmume that the resursive-inline issue applies only to functions, and not to drops. | |
| // I assume that the recursive-inline issue applies only to functions, and not to drops. |
| ) -> Option<FnAttribute<'gcc>> { | ||
| match inline { | ||
| InlineAttr::Always => { | ||
| // We can't simply always return `always_inline` unconditionally. | ||
| // It is *NOT A HINT* and does not work for recurisve functions. |
There was a problem hiding this comment.
Suggested change
| // It is *NOT A HINT* and does not work for recurisve functions. | |
| // It is *NOT A HINT* and does not work for recursive functions. |
| // It is *NOT A HINT* and does not work for recurisve functions. | ||
| // | ||
| // So, it can only be applied *if*: | ||
| // The current function does not call any functions makred `#[inline(always)]`. |
There was a problem hiding this comment.
Suggested change
| // The current function does not call any functions makred `#[inline(always)]`. | |
| // The current function does not call any functions marked `#[inline(always)]`. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #599.
Instead of always translating
#[inline(always)](which is a hint) toFnAttribute::AlwaysInline(which makes inlining mandatory), we now do so only for functions which don't call any functions with the#[inline(always)]or the rustc force inline attribute.In cases where
#[inline(always)]is applied to a function which might be recursive, it is demoted to#[inline]instead.This breaks the cycle, and prevents libjitgcc errors.
The regression test checks for direct and indirect recursion.