Skip to content

Commit da63695

Browse files
borsbors
committed
Auto merge of rust-lang#109983 - tmiasko:inline-try, r=bjorn3
Inline try_from and try_into To avoid link time dependency between core and compiler-builtins, when using opt-level that implicitly enables -Zshare-generics. While compiler-builtins should be compiled with -Zshare-generics disabled, the -Zbuild-std does not ensure this at the moment. r? `@bjorn3`
2 parents 9452402 + 7ddc245 commit da63695

5 files changed

+298
-182
lines changed

‎library/core/src/convert/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,7 @@ where
764764
{
765765
type Error = U::Error;
766766

767+
#[inline]
767768
fn try_into(self) -> Result<U, U::Error> {
768769
U::try_from(self)
769770
}
@@ -779,6 +780,7 @@ where
779780
{
780781
type Error = Infallible;
781782

783+
#[inline]
782784
fn try_from(value: U) -> Result<Self, Self::Error> {
783785
Ok(U::into(value))
784786
}

‎tests/mir-opt/inline/unchecked_shifts.unchecked_shl_unsigned_smaller.Inline.diff

+76-47
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,45 @@
1414
+ let mut _6: std::option::Option<u16>; // in scope 1 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
1515
+ let mut _7: std::result::Result<u16, std::num::TryFromIntError>; // in scope 1 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
1616
+ scope 2 {
17-
+ scope 3 (inlined Result::<u16, TryFromIntError>::ok) { // at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
18-
+ debug self => _7; // in scope 3 at $SRC_DIR/core/src/result.rs:LL:COL
19-
+ let mut _8: isize; // in scope 3 at $SRC_DIR/core/src/result.rs:LL:COL
20-
+ let _9: u16; // in scope 3 at $SRC_DIR/core/src/result.rs:LL:COL
21-
+ scope 4 {
22-
+ debug x => _9; // in scope 4 at $SRC_DIR/core/src/result.rs:LL:COL
17+
+ scope 3 (inlined <u32 as TryInto<u16>>::try_into) { // at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
18+
+ debug self => _4; // in scope 3 at $SRC_DIR/core/src/convert/mod.rs:LL:COL
19+
+ scope 4 (inlined convert::num::<impl TryFrom<u32> for u16>::try_from) { // at $SRC_DIR/core/src/convert/mod.rs:LL:COL
20+
+ debug u => _4; // in scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
21+
+ let mut _8: bool; // in scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
22+
+ let mut _9: u32; // in scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
23+
+ let mut _10: u16; // in scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
2324
+ }
24-
+ scope 5 {
25-
+ scope 6 {
26-
+ debug x => const TryFromIntError(()); // in scope 6 at $SRC_DIR/core/src/result.rs:LL:COL
25+
+ }
26+
+ scope 5 (inlined Result::<u16, TryFromIntError>::ok) { // at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
27+
+ debug self => _7; // in scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
28+
+ let mut _11: isize; // in scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
29+
+ let _12: u16; // in scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
30+
+ scope 6 {
31+
+ debug x => _12; // in scope 6 at $SRC_DIR/core/src/result.rs:LL:COL
32+
+ }
33+
+ scope 7 {
34+
+ scope 8 {
35+
+ debug x => const TryFromIntError(()); // in scope 8 at $SRC_DIR/core/src/result.rs:LL:COL
2736
+ }
2837
+ }
2938
+ }
30-
+ scope 7 (inlined #[track_caller] Option::<u16>::unwrap_unchecked) { // at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
31-
+ debug self => _6; // in scope 7 at $SRC_DIR/core/src/option.rs:LL:COL
32-
+ let mut _10: &std::option::Option<u16>; // in scope 7 at $SRC_DIR/core/src/option.rs:LL:COL
33-
+ let mut _11: isize; // in scope 7 at $SRC_DIR/core/src/option.rs:LL:COL
34-
+ scope 8 {
35-
+ debug val => _5; // in scope 8 at $SRC_DIR/core/src/option.rs:LL:COL
39+
+ scope 9 (inlined #[track_caller] Option::<u16>::unwrap_unchecked) { // at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
40+
+ debug self => _6; // in scope 9 at $SRC_DIR/core/src/option.rs:LL:COL
41+
+ let mut _13: &std::option::Option<u16>; // in scope 9 at $SRC_DIR/core/src/option.rs:LL:COL
42+
+ let mut _14: isize; // in scope 9 at $SRC_DIR/core/src/option.rs:LL:COL
43+
+ scope 10 {
44+
+ debug val => _5; // in scope 10 at $SRC_DIR/core/src/option.rs:LL:COL
3645
+ }
37-
+ scope 9 {
38-
+ scope 11 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL
39-
+ scope 12 {
40-
+ scope 13 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL
46+
+ scope 11 {
47+
+ scope 13 (inlined unreachable_unchecked) { // at $SRC_DIR/core/src/option.rs:LL:COL
48+
+ scope 14 {
49+
+ scope 15 (inlined unreachable_unchecked::runtime) { // at $SRC_DIR/core/src/intrinsics.rs:LL:COL
4150
+ }
4251
+ }
4352
+ }
4453
+ }
45-
+ scope 10 (inlined Option::<u16>::is_some) { // at $SRC_DIR/core/src/option.rs:LL:COL
46-
+ debug self => _10; // in scope 10 at $SRC_DIR/core/src/option.rs:LL:COL
54+
+ scope 12 (inlined Option::<u16>::is_some) { // at $SRC_DIR/core/src/option.rs:LL:COL
55+
+ debug self => _13; // in scope 12 at $SRC_DIR/core/src/option.rs:LL:COL
4756
+ }
4857
+ }
4958
+ }
@@ -55,58 +64,78 @@
5564
StorageLive(_4); // scope 0 at $DIR/unchecked_shifts.rs:+1:21: +1:22
5665
_4 = _2; // scope 0 at $DIR/unchecked_shifts.rs:+1:21: +1:22
5766
- _0 = core::num::<impl u16>::unchecked_shl(move _3, move _4) -> bb1; // scope 0 at $DIR/unchecked_shifts.rs:+1:5: +1:23
67+
- // mir::Constant
68+
- // + span: $DIR/unchecked_shifts.rs:11:7: 11:20
69+
- // + literal: Const { ty: unsafe fn(u16, u32) -> u16 {core::num::<impl u16>::unchecked_shl}, val: Value(<ZST>) }
5870
+ StorageLive(_5); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
5971
+ StorageLive(_6); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
6072
+ StorageLive(_7); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
61-
+ _7 = <u32 as TryInto<u16>>::try_into(_4) -> bb1; // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
62-
// mir::Constant
63-
- // + span: $DIR/unchecked_shifts.rs:11:7: 11:20
64-
- // + literal: Const { ty: unsafe fn(u16, u32) -> u16 {core::num::<impl u16>::unchecked_shl}, val: Value(<ZST>) }
65-
+ // + span: $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
66-
+ // + literal: Const { ty: fn(u32) -> Result<u16, <u32 as TryInto<u16>>::Error> {<u32 as TryInto<u16>>::try_into}, val: Value(<ZST>) }
73+
+ StorageLive(_8); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
74+
+ StorageLive(_9); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
75+
+ _9 = const 65535_u32; // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
76+
+ _8 = Gt(_4, move _9); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
77+
+ StorageDead(_9); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
78+
+ switchInt(move _8) -> [0: bb4, otherwise: bb3]; // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
6779
}
6880

6981
bb1: {
70-
+ StorageLive(_9); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
71-
+ _8 = discriminant(_7); // scope 3 at $SRC_DIR/core/src/result.rs:LL:COL
72-
+ switchInt(move _8) -> [0: bb6, 1: bb4, otherwise: bb5]; // scope 3 at $SRC_DIR/core/src/result.rs:LL:COL
73-
+ }
74-
+
75-
+ bb2: {
76-
+ StorageDead(_9); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
82+
+ StorageDead(_12); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
7783
+ StorageDead(_7); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
78-
+ StorageLive(_10); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
79-
+ _11 = discriminant(_6); // scope 7 at $SRC_DIR/core/src/option.rs:LL:COL
80-
+ switchInt(move _11) -> [1: bb7, otherwise: bb5]; // scope 7 at $SRC_DIR/core/src/option.rs:LL:COL
84+
+ StorageLive(_13); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
85+
+ _14 = discriminant(_6); // scope 9 at $SRC_DIR/core/src/option.rs:LL:COL
86+
+ switchInt(move _14) -> [1: bb9, otherwise: bb7]; // scope 9 at $SRC_DIR/core/src/option.rs:LL:COL
8187
+ }
8288
+
83-
+ bb3: {
89+
+ bb2: {
8490
+ StorageDead(_5); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
8591
StorageDead(_4); // scope 0 at $DIR/unchecked_shifts.rs:+1:22: +1:23
8692
StorageDead(_3); // scope 0 at $DIR/unchecked_shifts.rs:+1:22: +1:23
8793
return; // scope 0 at $DIR/unchecked_shifts.rs:+2:2: +2:2
8894
+ }
8995
+
96+
+ bb3: {
97+
+ _7 = Result::<u16, TryFromIntError>::Err(const TryFromIntError(())); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
98+
+ // mir::Constant
99+
+ // + span: no-location
100+
+ // + literal: Const { ty: TryFromIntError, val: Value(<ZST>) }
101+
+ goto -> bb5; // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
102+
+ }
103+
+
90104
+ bb4: {
91-
+ _6 = Option::<u16>::None; // scope 6 at $SRC_DIR/core/src/result.rs:LL:COL
92-
+ goto -> bb2; // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
105+
+ StorageLive(_10); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
106+
+ _10 = _4 as u16 (IntToInt); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
107+
+ _7 = Result::<u16, TryFromIntError>::Ok(move _10); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
108+
+ StorageDead(_10); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
109+
+ goto -> bb5; // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
93110
+ }
94111
+
95112
+ bb5: {
96-
+ unreachable; // scope 3 at $SRC_DIR/core/src/result.rs:LL:COL
113+
+ StorageDead(_8); // scope 4 at $SRC_DIR/core/src/convert/num.rs:LL:COL
114+
+ StorageLive(_12); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
115+
+ _11 = discriminant(_7); // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
116+
+ switchInt(move _11) -> [0: bb8, 1: bb6, otherwise: bb7]; // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
97117
+ }
98118
+
99119
+ bb6: {
100-
+ _9 = move ((_7 as Ok).0: u16); // scope 3 at $SRC_DIR/core/src/result.rs:LL:COL
101-
+ _6 = Option::<u16>::Some(move _9); // scope 4 at $SRC_DIR/core/src/result.rs:LL:COL
102-
+ goto -> bb2; // scope 3 at $SRC_DIR/core/src/result.rs:LL:COL
120+
+ _6 = Option::<u16>::None; // scope 8 at $SRC_DIR/core/src/result.rs:LL:COL
121+
+ goto -> bb1; // scope 7 at $SRC_DIR/core/src/result.rs:LL:COL
103122
+ }
104123
+
105124
+ bb7: {
106-
+ _5 = move ((_6 as Some).0: u16); // scope 7 at $SRC_DIR/core/src/option.rs:LL:COL
107-
+ StorageDead(_10); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
125+
+ unreachable; // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
126+
+ }
127+
+
128+
+ bb8: {
129+
+ _12 = move ((_7 as Ok).0: u16); // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
130+
+ _6 = Option::<u16>::Some(move _12); // scope 6 at $SRC_DIR/core/src/result.rs:LL:COL
131+
+ goto -> bb1; // scope 5 at $SRC_DIR/core/src/result.rs:LL:COL
132+
+ }
133+
+
134+
+ bb9: {
135+
+ _5 = move ((_6 as Some).0: u16); // scope 9 at $SRC_DIR/core/src/option.rs:LL:COL
136+
+ StorageDead(_13); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
108137
+ StorageDead(_6); // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
109-
+ _0 = unchecked_shl::<u16>(_3, move _5) -> [return: bb3, unwind unreachable]; // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
138+
+ _0 = unchecked_shl::<u16>(_3, move _5) -> [return: bb2, unwind unreachable]; // scope 2 at $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
110139
+ // mir::Constant
111140
+ // + span: $SRC_DIR/core/src/num/uint_macros.rs:LL:COL
112141
+ // + literal: Const { ty: unsafe extern "rust-intrinsic" fn(u16, u16) -> u16 {unchecked_shl::<u16>}, val: Value(<ZST>) }

0 commit comments

Comments
 (0)