diff options
| author | bors <bors@rust-lang.org> | 2024-06-09 18:54:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-09 18:54:46 +0000 |
| commit | 503dfcf4e03089cf0c06d10fc69b5477a2f766ef (patch) | |
| tree | d9629c6f0d6e25fd85886f1f957c68190e7253d3 /tests/codegen | |
| parent | 65d1a73aabc03c7f94633bf00eee1b5548c28c14 (diff) | |
| parent | a8cba36cbfcced6c1663161bfdd79bce43916fba (diff) | |
| download | rust-503dfcf4e03089cf0c06d10fc69b5477a2f766ef.tar.gz rust-503dfcf4e03089cf0c06d10fc69b5477a2f766ef.zip | |
Auto merge of #126202 - jieyouxu:rollup-2ixnizz, r=jieyouxu
Rollup of 6 pull requests Successful merges: - #125041 (Enable GVN for `AggregateKind::RawPtr`) - #125253 (Add `FRAC_1_SQRT_2PI` constant to f16/f32/f64/f128) - #125465 (bootstrap: vendor crates required by opt-dist to collect profiles ) - #125470 (Add release notes for 1.79.0) - #125963 (Remove hard-coded hashes from codegen tests) - #126188 (Fix documentation for `impl_common_helpers` in `run-make-support`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/codegen')
| -rw-r--r-- | tests/codegen/consts.rs | 4 | ||||
| -rw-r--r-- | tests/codegen/pattern_type_symbols.rs | 4 | ||||
| -rw-r--r-- | tests/codegen/virtual-function-elimination.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/codegen/consts.rs b/tests/codegen/consts.rs index 93c58c37c28..42ce7679d1a 100644 --- a/tests/codegen/consts.rs +++ b/tests/codegen/consts.rs @@ -9,11 +9,11 @@ // CHECK: @STATIC = {{.*}}, align 4 // This checks the constants from inline_enum_const -// CHECK: @alloc_af1f8e8e6f4b341431a1d405e652df2d = {{.*}}, align 2 +// CHECK: @alloc_[[INLINE_ENUM_HASH:[a-f0-9]{32}]] = {{.*}}, align 2 // This checks the constants from {low,high}_align_const, they share the same // constant, but the alignment differs, so the higher one should be used -// CHECK: [[LOW_HIGH:@alloc_[a-f0-9]+]] = {{.*}}, align 4 +// CHECK: [[LOW_HIGH:@alloc_[a-f0-9]{32}]] = {{.*}}, align 4 #[derive(Copy, Clone)] // repr(i16) is required for the {low,high}_align_const test diff --git a/tests/codegen/pattern_type_symbols.rs b/tests/codegen/pattern_type_symbols.rs index dfe83443348..a99b3efca41 100644 --- a/tests/codegen/pattern_type_symbols.rs +++ b/tests/codegen/pattern_type_symbols.rs @@ -15,9 +15,9 @@ fn foo<T>() {} pub fn bar() { // CHECK: call pattern_type_symbols::foo::<u32> - // CHECK: call void @_RINvCs3QvG2ESzx2Q_20pattern_type_symbols3foomEB2_ + // CHECK: call void @_RINvC[[CRATE_IDENT:[a-zA-Z0-9]{12}]]_20pattern_type_symbols3foomEB2_ foo::<u32>(); // CHECK: call pattern_type_symbols::foo::<(u32, [(); 0], [(); 999999999], [(); true])> - // CHECK: call void @_RINvCs3QvG2ESzx2Q_20pattern_type_symbols3fooTmAum0_Aum3b9ac9ff_Aub1_EEB2_ + // CHECK: call void @_RINvC[[CRATE_IDENT]]_20pattern_type_symbols3fooTmAum0_Aum3b9ac9ff_Aub1_EEB2_ foo::<NanoU32>(); } diff --git a/tests/codegen/virtual-function-elimination.rs b/tests/codegen/virtual-function-elimination.rs index 6c391d9114b..23d7657baa9 100644 --- a/tests/codegen/virtual-function-elimination.rs +++ b/tests/codegen/virtual-function-elimination.rs @@ -81,7 +81,7 @@ fn taking_u(u: &dyn U) -> i32 { } pub fn taking_v(v: &dyn V) -> i32 { - // CHECK: @llvm.type.checked.load({{.*}}, i32 24, metadata !"NtCs64ITQYi9761_28virtual_function_elimination1V") + // CHECK: @llvm.type.checked.load({{.*}}, i32 24, metadata !"NtC[[CRATE_IDENT:[a-zA-Z0-9]{12}]]_28virtual_function_elimination1V") v.public_function() } @@ -96,5 +96,5 @@ pub fn main() { // CHECK: ![[TYPE0]] = !{i64 0, !"[[MANGLED_TYPE0]]"} // CHECK: ![[VCALL_VIS0]] = !{i64 2} // CHECK: ![[TYPE1]] = !{i64 0, !"[[MANGLED_TYPE1]]"} -// CHECK: ![[TYPE2]] = !{i64 0, !"NtCs64ITQYi9761_28virtual_function_elimination1V"} +// CHECK: ![[TYPE2]] = !{i64 0, !"NtC[[CRATE_IDENT]]_28virtual_function_elimination1V"} // CHECK: ![[VCALL_VIS2]] = !{i64 1} |