diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2024-09-03 22:49:15 -0400 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-03-19 15:32:08 +0100 |
| commit | 99cbcd7c45354e334f6c30a937c96cd9962b583d (patch) | |
| tree | dca20c7f2697ad3673813c28da07b3bfb9b5ce2c /gcc | |
| parent | ca839781c9e121d80b19844b36967c2e14eaacb3 (diff) | |
| download | gcc-99cbcd7c45354e334f6c30a937c96cd9962b583d.zip gcc-99cbcd7c45354e334f6c30a937c96cd9962b583d.tar.gz gcc-99cbcd7c45354e334f6c30a937c96cd9962b583d.tar.bz2 | |
gccrs: Fix v0-mangle1.rs test when run with ASAN
gcc/rust/ChangeLog:
* util/rust-canonical-path.h
(CanonicalPath::CanonicalPath): Properly initialize crate_num
with copy constructor.
gcc/testsuite/ChangeLog:
* rust/compile/v0-mangle1.rs: Make v0-mangle test more crate_num
agnostic.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/util/rust-canonical-path.h | 4 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/v0-mangle1.rs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gcc/rust/util/rust-canonical-path.h b/gcc/rust/util/rust-canonical-path.h index af151c2..4d8f954 100644 --- a/gcc/rust/util/rust-canonical-path.h +++ b/gcc/rust/util/rust-canonical-path.h @@ -46,7 +46,9 @@ namespace Resolver { class CanonicalPath { public: - CanonicalPath (const CanonicalPath &other) : segs (other.segs) {} + CanonicalPath (const CanonicalPath &other) + : segs (other.segs), crate_num (other.crate_num) + {} CanonicalPath &operator= (const CanonicalPath &other) { diff --git a/gcc/testsuite/rust/compile/v0-mangle1.rs b/gcc/testsuite/rust/compile/v0-mangle1.rs index a34f1a7..04c546e 100644 --- a/gcc/testsuite/rust/compile/v0-mangle1.rs +++ b/gcc/testsuite/rust/compile/v0-mangle1.rs @@ -36,7 +36,7 @@ fn main() { // cf. rustc 1.72.0: _RNvNtCshIBIgX6Bzox_10v0_mangle18module_a3bar module_a::bar(); - // { dg-final { scan-assembler "_R.*NvNtNtC10v0_mangle18module_a8module_b3baz" } } + // { dg-final { scan-assembler "_R.*NvNtNtC.*10v0_mangle18module_a8module_b3baz" } } // cf. rustc 1.72.0: _RNvNtNtCshIBIgX6Bzox_10v0_mangle18module_a8module_b3baz module_a::module_b::baz(); |