Use const_eval_select macro instead of handrolling a call to the intrinsic

Author: oli-obk

library/core/src/any.rs

@@ -733,22 +733,21 @@ impl const PartialEq for TypeId {
         return crate::intrinsics::type_id_eq(*self, *other);
         #[cfg(not(miri))]
         {
-            const fn ct(a: &TypeId, b: &TypeId) -> bool {
-                crate::intrinsics::type_id_eq(*a, *b)
-            }
-
-            #[inline]
-            fn rt(a: &TypeId, b: &TypeId) -> bool {
-                a.data == b.data
-            }
-
-            // Ideally we would just invoke `type_id_eq` unconditionally here,
-            // but since we do not MIR inline intrinsics, because backends
-            // may want to override them (and miri does!), MIR opts do not
-            // clean up this call sufficiently for LLVM to turn repeated calls
-            // of `TypeId` comparisons against one specific `TypeId` into
-            // a lookup table.
-            core::intrinsics::const_eval_select((self, other), ct, rt)
+            let this = self;
+            crate::intrinsics::const_eval_select!(
+                @capture { this: &TypeId, other: &TypeId } -> bool:
+                if const {
+                    crate::intrinsics::type_id_eq(*this, *other)
+                } else {
+                    // Ideally we would just invoke `type_id_eq` unconditionally here,
+                    // but since we do not MIR inline intrinsics, because backends
+                    // may want to override them (and miri does!), MIR opts do not
+                    // clean up this call sufficiently for LLVM to turn repeated calls
+                    // of `TypeId` comparisons against one specific `TypeId` into
+                    // a lookup table.
+                    this.data == other.data
+                }
+            )
         }
     }
 }

tests/ui/consts/const_transmute_type_id2.stderr

@@ -6,8 +6,9 @@ LL |     assert!(a == b);
    |
 note: inside `<TypeId as PartialEq>::eq`
   --> $SRC_DIR/core/src/any.rs:LL:COL
-note: inside `<TypeId as PartialEq>::eq::ct`
+note: inside `<TypeId as PartialEq>::eq::compiletime`
   --> $SRC_DIR/core/src/any.rs:LL:COL
+   = note: this error originates in the macro `$crate::intrinsics::const_eval_select` which comes from the expansion of the macro `crate::intrinsics::const_eval_select` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 1 previous error
 

tests/ui/consts/const_transmute_type_id3.stderr

@@ -6,8 +6,9 @@ LL |     assert!(a == b);
    |
 note: inside `<TypeId as PartialEq>::eq`
   --> $SRC_DIR/core/src/any.rs:LL:COL
-note: inside `<TypeId as PartialEq>::eq::ct`
+note: inside `<TypeId as PartialEq>::eq::compiletime`
   --> $SRC_DIR/core/src/any.rs:LL:COL
+   = note: this error originates in the macro `$crate::intrinsics::const_eval_select` which comes from the expansion of the macro `crate::intrinsics::const_eval_select` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 1 previous error