diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2024-09-03 22:49:15 -0400 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2024-09-06 10:59:08 +0000 |
| commit | 12af831615a77e1920de5943bf2251b6c01b0e25 (patch) | |
| tree | bd7d698867bc04254dac6624a3a59f0b2e2498fa | |
| parent | 8ab5dd8e6584712ad107a25d62e14aa0f3c6a220 (diff) | |
| download | gcc-12af831615a77e1920de5943bf2251b6c01b0e25.zip gcc-12af831615a77e1920de5943bf2251b6c01b0e25.tar.gz gcc-12af831615a77e1920de5943bf2251b6c01b0e25.tar.bz2 | |
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>
| -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 969ac7f..1584634 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(); |