Expand FormatArgs node as AST pass #2893
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CohenArthur
force-pushed
the
expand-format-args-ast
branch
3 times, most recently
from
1478b6a to
93192c6
Compare
P-E-P
requested changes
Mar 18, 2024
| std::string | ||
| ffi::RustHamster::to_string () const | ||
| { | ||
| return std::string (ptr, len); |
There was a problem hiding this comment.
Should we implement a string view type instead ?
There was a problem hiding this comment.
I think eventually yes, but not for now because this has FFI implications and this PR is already big enough IMO
| auto it = spec_map.find (format_specifier.ty.to_string ()); | ||
|
|
||
| if (it == spec_map.end ()) | ||
| rust_unreachable (); |
There was a problem hiding this comment.
We should probably emit an error ? Or at least report to the caller ?
There was a problem hiding this comment.
I think this should be addressed in a later PR. I'm not sure if the parser is responsible for handling these errors or if this is something we should indeed emit ourselves. We'll see as we move forward with the format_args!() implementation
CohenArthur
force-pushed
the
expand-format-args-ast
branch
2 times, most recently
from
27ac75a to
1fe32c0
Compare
P-E-P
approved these changes
Mar 19, 2024
CohenArthur
force-pushed
the
expand-format-args-ast
branch
2 times, most recently
from
b3dc88a to
69bf48d
Compare
gcc/rust/ChangeLog: * Make-lang.in: Add new object. * hir/rust-ast-lower-expr.cc (ASTLoweringExpr::visit): Remove calls to FormatArgsLowering. * expand/rust-expand-format-args.cc: New file. * expand/rust-expand-format-args.h: New file.
gcc/rust/ChangeLog: * ast/rust-fmt.cc (ffi::RustHamster::to_string): New. (Pieces::collect): Adapt to use new handle API. (Pieces::~Pieces): Likewise. (Pieces::Pieces): Likewise. (Pieces::operator=): Likewise. * ast/rust-fmt.h (struct RustString): Add members. (struct FormatArgsHandle): New. (clone_pieces): Adapt for new FFI API. (destroy_pieces): Likewise. (struct Pieces): Store new FormatArgsHandle type. * expand/rust-expand-format-args.cc (expand_format_args): Use proper namespace. * resolve/rust-ast-resolve-base.cc (ResolverBase::visit): FormatArgs nodes are already resolved, so do nothing. libgrust/ChangeLog: * libformat_parser/src/lib.rs: Use new Handle struct and expose it.
gcc/rust/ChangeLog: * ast/rust-ast-builder.h: Rename AST::AstBuilder -> AST::Builder * ast/rust-ast-builder.cc: Likewise. * expand/rust-derive.cc: Use new AST::Builder name. * expand/rust-derive.h: Likewise. * ast/rust-builtin-ast-nodes.h: Add required getters. * expand/rust-expand-format-args.cc (format_arg): New. (get_trait_name): New. (expand_format_args): Properly expand basic format_args!() invocations. * expand/rust-expand-format-args.h (expand_format_args): Fix signature. * expand/rust-macro-builtins.cc (MacroBuiltin::format_args_handler): Call into expand_format_args().
gcc/testsuite/ChangeLog: * rust/compile/format_args_basic_expansion.rs: New test.
This fixes an issue we had where the generated code ended with more static pieces than its rustc counterpart. gcc/rust/ChangeLog: * expand/rust-macro-builtins.cc (struct FormatArgsInput): Store the format_str as a string instead of an AST::Expr. (format_args_parse_arguments): Transform format_expr into a format string properly - add note for handling eager macro invocations later on. (MacroBuiltin::format_args_handler): Parse the correct input, append newline to format_str if necessary.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Needs #2859
Needs #2917 for GCC 4.8 to have Rust 1.72 installed (for
String::leak)