diff options
| author | bors <bors@rust-lang.org> | 2024-03-10 11:58:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-10 11:58:22 +0000 |
| commit | cdb775cab50311de54ccf3a07b331cc56b0da436 (patch) | |
| tree | 61b9445089119b702bf56860884ff871dfd6b893 /tests/codegen | |
| parent | 3521a2f2f317cb978063842485c7d1bc86ec82b6 (diff) | |
| parent | 9d03046a8185dfa103a47ba41f1d70438b407375 (diff) | |
| download | rust-cdb775cab50311de54ccf3a07b331cc56b0da436.tar.gz rust-cdb775cab50311de54ccf3a07b331cc56b0da436.zip | |
Auto merge of #122283 - matthiaskrgr:rollup-w3sau3u, r=matthiaskrgr
Rollup of 14 pull requests Successful merges: - #112136 (Add std::ffi::c_str module) - #113525 (Dynamically size sigaltstk in std) - #121567 (Avoid some interning in bootstrap) - #121642 (Update a test to support Symbol Mangling V0) - #121685 (Fixing shellcheck comments on lvi test script) - #121860 (Add a tidy check that checks whether the fluent slugs only appear once) - #121942 (std::rand: enable getrandom for dragonflybsd too.) - #122125 (Revert back to Git-for-Windows for MinGW CI builds) - #122221 (match lowering: define a convenient struct) - #122244 (fix: LocalWaker memory leak and some stability attributes) - #122251 (Add test to check unused_lifetimes don't duplicate "parameter is never used" error) - #122264 (add myself to rotation) - #122269 (doc/rustc: Move loongarch64-unknown-linux-musl to Tier 3) - #122271 (Fix legacy numeric constant diag items) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/codegen')
| -rw-r--r-- | tests/codegen/debuginfo-inline-callsite-location.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/codegen/debuginfo-inline-callsite-location.rs b/tests/codegen/debuginfo-inline-callsite-location.rs index 833e8c0df91..f690c9c0937 100644 --- a/tests/codegen/debuginfo-inline-callsite-location.rs +++ b/tests/codegen/debuginfo-inline-callsite-location.rs @@ -4,9 +4,9 @@ // can correctly merge the debug info if it merges the inlined code (e.g., for merging of tail // calls to panic. -// CHECK: tail call void @_ZN4core6option13unwrap_failed17h{{([0-9a-z]{16})}}E +// CHECK: tail call void @{{[A-Za-z0-9_]+4core6option13unwrap_failed}} // CHECK-SAME: !dbg ![[#first_dbg:]] -// CHECK: tail call void @_ZN4core6option13unwrap_failed17h{{([0-9a-z]{16})}}E +// CHECK: tail call void @{{[A-Za-z0-9_]+4core6option13unwrap_failed}} // CHECK-SAME: !dbg ![[#second_dbg:]] // CHECK-DAG: ![[#func_dbg:]] = distinct !DISubprogram(name: "unwrap<i32>" |