-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #100522 - cjgillot:inline-polymorphic-recursion, r=tm…
…iasko Only check the `DefId` for the recursion check in MIR inliner. The current history check compares `Instance`s, so it cannot detect cases of polymorphic recursion where `Substs` change. This PR makes it so we only compare `DefId`s, ignoring any change in `Substs`. According to #100522 (comment), in practice only very few inlining decisions change. Fixes #100476
- Loading branch information
Showing
2 changed files
with
34 additions
and
4 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
// Make sure that the MIR inliner does not loop indefinitely on polymorphic recursion. | ||
// compile-flags: --crate-type lib | ||
|
||
// Randomize `def_path_hash` by defining them under a module with different names | ||
macro_rules! emit { | ||
($($m:ident)*) => {$( | ||
pub mod $m { | ||
pub trait Tr { type Next: Tr; } | ||
|
||
pub fn hoge<const N: usize, T: Tr>() { | ||
inner::<N, T>(); | ||
} | ||
|
||
#[inline(always)] | ||
fn inner<const N: usize, T: Tr>() | ||
{ | ||
inner::<N, T::Next>(); | ||
inner::<N, T::Next>(); | ||
} | ||
} | ||
)*}; | ||
} | ||
|
||
// Increase the chance of triggering the bug | ||
emit!(m00 m01 m02 m03 m04 m05 m06 m07 m08 m09 m10 m11 m12 m13 m14 m15 m16 m17 m18 m19); |