[gcc/devel/rust/master] Merge #1043 #1064

[gcc/devel/rust/master] Merge #1043 #1064

[Thomas Schwinge]

https://gcc.gnu.org/g:0fa882160df40cee56b5cdd0a2953b4abb4b9d18

commit 0fa882160df40cee56b5cdd0a2953b4abb4b9d18
Merge: 3a90596517a 261c753e56c 5651331236d
Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Date:   Thu Mar 24 16:54:54 2022 +0000

    Merge #1043 #1064
    
    1043: implement include_bytes! and include_str! macros r=CohenArthur a=dafaust
    
    Implement the include_bytes! and include_str! builtin macros.
    
    Addresses:  #927
    
    1064: Handle :tt fragments properly r=CohenArthur a=CohenArthur
    
    :tt fragments stand for token trees, and are composed of either a token,
    or a delimited token tree, which is a token tree surrounded by
    delimiters (parentheses, curly brackets or square brackets).
    
    This should allow us to handle a lot more macros, including extremely
    powerful macro patterns such as TT munchers
    
    
    Co-authored-by: David Faust <david.faust@oracle.com>
    Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>

Diff:

 gcc/rust/expand/rust-macro-builtins.cc             | 173 +++++++++++++++++++++
 gcc/rust/expand/rust-macro-builtins.h              |   6 +
 gcc/rust/expand/rust-macro-expand.cc               |   4 +-
 gcc/rust/parse/rust-parse.h                        |   2 +-
 gcc/rust/util/rust-hir-map.cc                      |   2 +
 .../rust/compile/builtin_macro_include_bytes.rs    |  12 ++
 .../rust/compile/builtin_macro_include_str.rs      |  12 ++
 .../execute/torture/builtin_macro_include_bytes.rs |  44 ++++++
 .../execute/torture/builtin_macro_include_str.rs   |  23 +++
 gcc/testsuite/rust/execute/torture/include.txt     |   1 +
 gcc/testsuite/rust/execute/torture/macros25.rs     |  13 ++
 gcc/testsuite/rust/execute/torture/macros26.rs     |  12 ++
 12 files changed, 300 insertions(+), 4 deletions(-)