Skip to content

Commit

Permalink
Auto merge of #120370 - x17jiri:likely_unlikely_fix, r=saethlin
Browse files Browse the repository at this point in the history
Likely unlikely fix

RFC 1131 ( rust-lang/rust#26179 ) added likely/unlikely intrinsics, but they have been broken for a while: rust-lang/rust#96276 , rust-lang/rust#96275 , rust-lang/rust#88767 . This PR tries to fix them.

Changes:
- added a new `cold_path()` intrinsic
- `likely()` and `unlikely()` changed to regular functions implemented using `cold_path()`
  • Loading branch information
bors committed Nov 17, 2024
2 parents 2cba2ac + 1da548f commit e8c42a8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/pass/shims/time-with-isolation.stdout
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
The loop took around 1250ms
The loop took around 1350ms
(It's fine for this number to change when you `--bless` this test.)

0 comments on commit e8c42a8

Please sign in to comment.