[gcc/devel/rust/master] Merge #1430

[Thomas Schwinge]

https://gcc.gnu.org/g:bc65cac0e79c9799fa62635df295e73b14501660

commit bc65cac0e79c9799fa62635df295e73b14501660
Merge: c788a806195 8141f618bb5
Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Date:   Thu Aug 4 19:47:43 2022 +0000

    Merge #1430
    
    1430: hir: more conformant builtin macro detection r=philberty a=liushuyu
    
    - hir: more conformant builtin macro detection
    
    Fixes #971
    
    Co-authored-by: liushuyu <liushuyu011@gmail.com>

Diff:

 gcc/rust/util/rust-hir-map.cc                        | 20 +++++++++++++++++---
 .../rust/compile/builtin_macro_compile_error.rs      |  1 +
 gcc/testsuite/rust/compile/builtin_macro_concat.rs   |  1 +
 gcc/testsuite/rust/compile/builtin_macro_env.rs      |  1 +
 .../rust/compile/builtin_macro_include_bytes.rs      |  1 +
 .../rust/compile/builtin_macro_include_str.rs        |  1 +
 gcc/testsuite/rust/compile/macro42.rs                |  1 +
 .../rust/execute/torture/builtin_macro_cfg.rs        |  1 +
 .../rust/execute/torture/builtin_macro_concat.rs     |  1 +
 .../rust/execute/torture/builtin_macro_env.rs        |  2 +-
 .../execute/torture/builtin_macro_include_bytes.rs   |  2 +-
 .../execute/torture/builtin_macro_include_str.rs     |  2 +-
 .../rust/execute/torture/builtin_macro_line.rs       |  3 ++-
 .../rust/execute/torture/builtin_macros1.rs          |  1 +
 .../rust/execute/torture/builtin_macros3.rs          |  1 +
 gcc/testsuite/rust/execute/torture/macros29.rs       |  1 +
 gcc/testsuite/rust/execute/torture/macros30.rs       |  1 +
 gcc/testsuite/rust/execute/torture/macros31.rs       |  1 +
 18 files changed, 35 insertions(+), 7 deletions(-)