Auto merge of #61300 - indygreg:upgrade-cross-make, r=sanxiyn

[rust.git] / src / librustc / ty / constness.rs

diff --git a/src/librustc/ty/constness.rs b/src/librustc/ty/constness.rs
index e33d0a74ea013ab99c408b322d2239d84a705c15..7298b548f3197ab248581f3d9fa70aacffef76cb 100644 (file)
--- a/src/librustc/ty/constness.rs
+++ b/src/librustc/ty/constness.rs
@@ -95,9 +95,16 @@ fn is_promotable_const_fn<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId)
         }
     }
 
+    fn const_fn_is_allowed_fn_ptr<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> bool {
+        tcx.is_const_fn(def_id) &&
+            tcx.lookup_stability(def_id)
+                .map(|stab| stab.allow_const_fn_ptr).unwrap_or(false)
+    }
+
     *providers = Providers {
         is_const_fn_raw,
         is_promotable_const_fn,
+        const_fn_is_allowed_fn_ptr,
         ..*providers
     };
 }