Revert "Use intrinsics::assume instead of hint::assert_unchecked."

This reverts commit 90ebc24.

Author: reitermarkus

library/core/src/unicode/unicode_data.rs

@@ -94,10 +94,7 @@ unsafe fn skip_search<const SOR: usize, const OFFSETS: usize>(
     // correct location cannot be past it, so `Err(idx) => idx != length` either.
     //
     // This means that we can avoid bounds checking for the accesses below, too.
-    //
-    // We need to use `intrinsics::assume` since the `panic_nounwind` contained
-    // in `hint::assert_unchecked` may not be optimized out.
-    unsafe { crate::intrinsics::assume(last_idx < SOR) };
+    unsafe { crate::hint::assert_unchecked(last_idx < SOR) };
 
     let mut offset_idx = short_offset_runs[last_idx].start_index();
     let length = if let Some(next) = short_offset_runs.get(last_idx + 1) {
@@ -115,10 +112,7 @@ unsafe fn skip_search<const SOR: usize, const OFFSETS: usize>(
         // SAFETY: It is guaranteed that `length <= OFFSETS - offset_idx`,
         // so it follows that `length - 1 + offset_idx < OFFSETS`, therefore
         // `offset_idx < OFFSETS` is always true in this loop.
-        //
-        // We need to use `intrinsics::assume` since the `panic_nounwind` contained
-        // in `hint::assert_unchecked` may not be optimized out.
-        unsafe { crate::intrinsics::assume(offset_idx < OFFSETS) };
+        unsafe { crate::hint::assert_unchecked(offset_idx < OFFSETS) };
         let offset = offsets[offset_idx];
         prefix_sum += offset as u32;
         if prefix_sum > total {

src/tools/unicode-table-generator/src/range_search.rs

@@ -92,10 +92,7 @@ unsafe fn skip_search<const SOR: usize, const OFFSETS: usize>(
     // correct location cannot be past it, so `Err(idx) => idx != length` either.
     //
     // This means that we can avoid bounds checking for the accesses below, too.
-    //
-    // We need to use `intrinsics::assume` since the `panic_nounwind` contained
-    // in `hint::assert_unchecked` may not be optimized out.
-    unsafe { crate::intrinsics::assume(last_idx < SOR) };
+    unsafe { crate::hint::assert_unchecked(last_idx < SOR) };
 
     let mut offset_idx = short_offset_runs[last_idx].start_index();
     let length = if let Some(next) = short_offset_runs.get(last_idx + 1) {
@@ -113,10 +110,7 @@ unsafe fn skip_search<const SOR: usize, const OFFSETS: usize>(
         // SAFETY: It is guaranteed that `length <= OFFSETS - offset_idx`,
         // so it follows that `length - 1 + offset_idx < OFFSETS`, therefore
         // `offset_idx < OFFSETS` is always true in this loop.
-        //
-        // We need to use `intrinsics::assume` since the `panic_nounwind` contained
-        // in `hint::assert_unchecked` may not be optimized out.
-        unsafe { crate::intrinsics::assume(offset_idx < OFFSETS) };
+        unsafe { crate::hint::assert_unchecked(offset_idx < OFFSETS) };
         let offset = offsets[offset_idx];
         prefix_sum += offset as u32;
         if prefix_sum > total {