about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLukas Wirth <lukastw97@gmail.com>2021-12-04 00:51:50 +0100
committerLukas Wirth <lukastw97@gmail.com>2021-12-04 00:51:50 +0100
commit144200c821e6ea7aa29d9e960b878700bbaa778b (patch)
tree177d136fe014b07feabdbefc1271e0d21e22b130
parent4691a0647b2c96cc475d8bbe7c31fe194d1443e7 (diff)
downloadrust-144200c821e6ea7aa29d9e960b878700bbaa778b.tar.gz
rust-144200c821e6ea7aa29d9e960b878700bbaa778b.zip
minor: Update list of safe intrinsics
-rw-r--r--crates/hir_def/src/item_tree/lower.rs4
-rw-r--r--crates/hir_expand/src/name.rs1
2 files changed, 3 insertions, 2 deletions
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs
index bb224f57b23..32213aac390 100644
--- a/crates/hir_def/src/item_tree/lower.rs
+++ b/crates/hir_def/src/item_tree/lower.rs
@@ -694,11 +694,11 @@ enum GenericsOwner<'a> {
 
 /// Returns `true` if the given intrinsic is unsafe to call, or false otherwise.
 fn is_intrinsic_fn_unsafe(name: &Name) -> bool {
-    // Should be kept in sync with https://github.com/rust-lang/rust/blob/0cd0709f19d316c4796fa71c5f52c8612a5f3771/compiler/rustc_typeck/src/check/intrinsic.rs#L72-L105
+    // Should be kept in sync with https://github.com/rust-lang/rust/blob/532d2b14c05f9bc20b2d27cbb5f4550d28343a36/compiler/rustc_typeck/src/check/intrinsic.rs#L72-L106
     ![
-        known::abort,
         known::add_with_overflow,
         known::bitreverse,
+        known::black_box,
         known::bswap,
         known::caller_location,
         known::ctlz,
diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs
index 95d272ba682..ab730b54bc3 100644
--- a/crates/hir_expand/src/name.rs
+++ b/crates/hir_expand/src/name.rs
@@ -272,6 +272,7 @@ pub mod known {
         // Safe intrinsics
         abort,
         add_with_overflow,
+        black_box,
         bitreverse,
         bswap,
         caller_location,