diff options
author | Arthur Cohen <arthur.cohen@embecosm.com> | 2023-02-15 10:52:28 +0100 |
---|---|---|
committer | CohenArthur <arthur.cohen@embecosm.com> | 2023-02-15 13:56:17 +0000 |
commit | d6e33adc7174bfd52afc47cd5792320ca42e13fd (patch) | |
tree | 755c2122cc3526977a5e69e45e2db07a41fd34be /gcc/rust | |
parent | 64ea37670afb4a5e57f019687c6f6e8bf261d4a9 (diff) | |
download | gcc-d6e33adc7174bfd52afc47cd5792320ca42e13fd.zip gcc-d6e33adc7174bfd52afc47cd5792320ca42e13fd.tar.gz gcc-d6e33adc7174bfd52afc47cd5792320ca42e13fd.tar.bz2 |
builtins: Return empty list of tokens instead of nullptr
gcc/rust/ChangeLog:
* expand/rust-macro-builtins.cc (MacroBuiltin::include_handler): Do not
return nullptr token in expansion of `include!()`
gcc/testsuite/ChangeLog:
* rust/compile/empty.in: New test.
* rust/compile/include_empty.rs: New test.
Diffstat (limited to 'gcc/rust')
-rw-r--r-- | gcc/rust/expand/rust-macro-builtins.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gcc/rust/expand/rust-macro-builtins.cc b/gcc/rust/expand/rust-macro-builtins.cc index 3b6f69b..9759492 100644 --- a/gcc/rust/expand/rust-macro-builtins.cc +++ b/gcc/rust/expand/rust-macro-builtins.cc @@ -752,8 +752,19 @@ MacroBuiltin::include_handler (Location invoc_locus, AST::MacroInvocData &invoc) nodes.push_back (node); } - // FIXME: Do not return an empty token vector here - return AST::Fragment (nodes, nullptr); + // FIXME: This returns an empty vector of tokens and works fine, but is that + // the expected behavior? `include` macros are a bit harder to reason about + // since they include tokens. Furthermore, our lexer has no easy way to return + // a slice of tokens like the MacroInvocLexer. So it gets even harder to + // extrac tokens from here. For now, let's keep it that way and see if it + // eventually breaks, but I don't expect it to cause many issues since the + // list of tokens is only used when a macro invocation mixes eager + // macro invocations and already expanded tokens. Think + // `concat!(a!(), 15, b!())`. We need to be able to expand a!(), expand b!(), + // and then insert the `15` token in between. In the case of `include!()`, we + // only have one argument. So it's either going to be a macro invocation or a + // string literal. + return AST::Fragment (nodes, std::vector<std::unique_ptr<AST::Token>> ()); } AST::Fragment |