about summary refs log tree commit diff
path: root/compiler
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-09-17 21:37:01 +0000
committerbors <bors@rust-lang.org>2021-09-17 21:37:01 +0000
commita58db2e4ddbb2e0fa91c53c4901b52a7ef71ef2d (patch)
treecd01666a0f6358822a6062f16543b6e9cdd9fefd /compiler
parent9dd4ce80fb01d1ff5cb5002f08b7b3847b59e664 (diff)
parentb76b2c263d6afdeb08554d4c4e66b16ea30ef336 (diff)
downloadrust-a58db2e4ddbb2e0fa91c53c4901b52a7ef71ef2d.tar.gz
rust-a58db2e4ddbb2e0fa91c53c4901b52a7ef71ef2d.zip
Auto merge of #88962 - fee1-dead:const-drop, r=oli-obk
inline(always) on check_recursion_limit

r? `@oli-obk`

#88558 caused a regression, this PR adds `#[inline(always)]` to `check_recursion_limit`, a possible suspect of that regression.
Diffstat (limited to 'compiler')
-rw-r--r--compiler/rustc_trait_selection/src/traits/select/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/select/mod.rs b/compiler/rustc_trait_selection/src/traits/select/mod.rs
index d5660c1c7ba..a3a9086c5ad 100644
--- a/compiler/rustc_trait_selection/src/traits/select/mod.rs
+++ b/compiler/rustc_trait_selection/src/traits/select/mod.rs
@@ -1052,6 +1052,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
     ///
     /// The weird return type of this function allows it to be used with the `try` (`?`)
     /// operator within certain functions.
+    #[inline(always)]
     fn check_recursion_limit<T: Display + TypeFoldable<'tcx>, V: Display + TypeFoldable<'tcx>>(
         &self,
         obligation: &Obligation<'tcx, T>,