diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-12-04 19:14:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 19:14:59 +0000 |
| commit | 22329b03a6e0a3381d907745205012cf290b3c2a (patch) | |
| tree | f6c9616a3c3ab3c69c5d5be7a020934162fb05e7 /gcc/rust/backend/rust-compile-resolve-path.h | |
| parent | 402118688f56d88d213572ee55a4245eec83b25f (diff) | |
| parent | 071e8b001c7834c38dc4db697dd10d26eba67149 (diff) | |
| download | gcc-22329b03a6e0a3381d907745205012cf290b3c2a.zip gcc-22329b03a6e0a3381d907745205012cf290b3c2a.tar.gz gcc-22329b03a6e0a3381d907745205012cf290b3c2a.tar.bz2 | |
Merge #1676
1676: Fix regressions in 32 bit mode and gcc4.8 builds r=CohenArthur a=philberty
This reverts commit 9657c328d0cdda49b7985c3ee727781a387e128b.
This reverts commit fc59d137491ce393797dfec1d8cd5251a41b5f67.
Co-authored-by: Philip Herron <philip.herron@embecosm.com>
Diffstat (limited to 'gcc/rust/backend/rust-compile-resolve-path.h')
| -rw-r--r-- | gcc/rust/backend/rust-compile-resolve-path.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/rust/backend/rust-compile-resolve-path.h b/gcc/rust/backend/rust-compile-resolve-path.h index 63441b6..f0360bd 100644 --- a/gcc/rust/backend/rust-compile-resolve-path.h +++ b/gcc/rust/backend/rust-compile-resolve-path.h @@ -61,7 +61,8 @@ public: {} tree resolve (const HIR::PathIdentSegment &final_segment, - const Analysis::NodeMapping &mappings, Location locus); + const Analysis::NodeMapping &mappings, Location locus, + bool is_qualified_path); tree resolved; }; |