Auto merge of #120370 - x17jiri:likely_unlikely_fix, r=saethlin

bors · bors · commit e8c42a83f31b · 2024-11-17T23:57:53.000Z
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()`
diff --git a/tests/pass/shims/time-with-isolation.stdout b/tests/pass/shims/time-with-isolation.stdout
@@ -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.)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-The loop took around 1250ms`
	`1`	`+The loop took around 1350ms`
`2`	`2`	(It's fine for this number to change when you `--bless` this test.)