[gcc/devel/rust/master] Merge #1364 #1365 #1368

[gcc/devel/rust/master] Merge #1364 #1365 #1368

[Thomas Schwinge]

https://gcc.gnu.org/g:98b3f9bca253d1ecfae6fb94d255d8e991e4b92c

commit 98b3f9bca253d1ecfae6fb94d255d8e991e4b92c
Merge: c8a9218a5ba 14321979849 9507bdec30f d99b68560c0
Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Date:   Thu Jul 7 10:12:11 2022 +0000

    Merge #1364 #1365 #1368
    
    1364: Allow linemap to be optional nullptr r=philberty a=philberty
    
    The line map within the lexer is used to notify GCC of location data.
    This lexer is used on raw string buffers where the linemap can be
    null and thus can hit nullptr's. This patch wraps the linemap usage
    behind a function. We might make the linemap mandatory as a reference
    but lets figure out how the location info should look for imports first.
    
    1365: Support extern-blocks in ast-dumps r=philberty a=philberty
    
    This allows us to support really basic expressions and extern blocks. These
    are used for the hello world version of importing metadata in crates.
    
    
    1368: Fix bad ABI from string method r=philberty a=philberty
    
    We use this method to turn the string ABI into the enum. The
    rust abi was wrongly turned into the C ABI always which was
    causing issues on the mangling logic for extern crate items.
    
    Co-authored-by: Philip Herron <philip.herron@embecosm.com>

Diff:

 gcc/rust/ast/rust-ast-dump.cc | 87 +++++++++++++++++++++++++++++++++++++++----
 gcc/rust/ast/rust-ast-dump.h  |  1 +
 gcc/rust/lex/rust-lex.cc      | 20 +++++++---
 gcc/rust/lex/rust-lex.h       |  2 +
 gcc/rust/util/rust-abi.cc     |  2 +-
 5 files changed, 98 insertions(+), 14 deletions(-)