RAIIFile constructor was accepting directory filename. This lead to
unattended directory opening in some part of the code (load_file_bytes)
wich resulted in ice. Since RAIIFile are used for the lexer, removing
the ability to open directories with RAIIFile fixes those issues and
prevent future mistakes.
Owen Avery [Fri, 3 Feb 2023 15:19:32 +0000 (10:19 -0500)]
Simplify WildcardPattern let statement handling
gcc/rust/ChangeLog:
* backend/rust-compile-pattern.cc
(CompilePatternLet::visit): Simplify WildcardPattern compilation for let statements.
* backend/rust-compile-var-decl.h:
(CompileVarDecl::visit): Remove variable declaration for WildcardPattern.
* resolve/rust-ast-resolve-pattern.h:
(PatternDeclaration::visit): Remove name resolution for WildcardPattern.
In #1847 "Merge upstream, last commit before 2023-01-31 GCC/Rust upstreaming"
we merged commit 9e56306f4d7c15e7667d8ac0b62ae6efb93ba756 from upstream GCC
master branch.
- 5be4c2687a89 gccrs: session-manager: Add ast-pretty-expanded dump
- e66fec8e6ba3 gccrs: const folding port
- ff8a56950776 gccrs: Desugar double borrows into two HIR:BorrowExpr's
- 86743891a6e9 gccrs: backend: Expose Bvariable class through rust-gcc header
- 41547275c5e9 gccrs: builtins: Add add_overflow builtin and refactor class
- 9c87dc0afe05 gccrs: backend: Add overflow checks to every arithmetic operation
- 3a3a352091b7 gccrs: rustc_attrs: Allow `rustc_inherit_overflow_checks` as a builtin..
- 938facc5e93a gccrs: lint: Do not emit unused warnings for public items
- f7014b28b81f gccrs: parser: Parse RangeFullExpr without erroring out
- 1fed030c1651 gccrs: macros: Handle matchers properly in repetitions
- 252216dd0c59 gccrs: transcriber: Do not infinite loop if the current parsed node is an error
- 7dc41901213d gccrs: dump: Add AST debugging using the AST::Dump class
- 55fb35c51b2e gccrs: ast: Only expand expressions and types if the kind is right
- 3663d7ef6662 gccrs: ast: Add better assertion on AST fragments
- 245ce6f26a16 gccrs: Add guards against getting data from an empty vector
- af22b54af53c gccrs: Add missing location info to coercions
- 7ad24d802e59 gccrs: Refactor unify to hit a unify_site
- 1eabeb5aecc9 gccrs: Remove param_use_canonical_types checks ported from c++ front-end
- ffa16a4590ad gccrs: Create canonical process of compiling constant items
- 43cb42a3d82d gccrs: Add extra debugging for method call expressions
- e641158a5f5c gccrs: Add new check for contains_associated_types
- 0fffc0e772d6 gccrs: Unit structs are not concrete when they need substitutions
- 689a5c6711b8 gccrs: bugfix: initialize slice from array in const context
- b0ff1647cbe6 gccrs: add testcase to test component_ref and constructor codes in eval_constant_expression()
- e6a3886a833a gccrs: backend: correctly formulate the exit condition ...
- dd9d6656e9a4 gccrs: add testcase with struct to test component_ref and constructor codes..
- 0d5adf093566 gccrs: testsuite: add loop condition execution test
- 288b6298a6ae gccrs: const generics: Make sure const generic types are visited properly
- ff9d7741d4b9 gccrs: const generics: Forbid default values in Functions, Traits and Impls
- 739d0509ed55 gccrs: attributes: Add #[macro_use] as builtin
- 3736647947b6 gccrs: module lowering: Do not append null pointers as items
- 70fc174b78a2 gccrs: Static Items must be const evaluated
- 408ab8a6e412 gccrs: Statics are a coercion site
- a0c2ea3ee6e4 gccrs: remove bad assertion
- f92f8ee75bf0 gccrs: Add testcase for const-eval issue from rust-blog
- 9d6b434e1fda gccrs: rust: Add -frust-compile-until option
- e88ce5cc6847 gccrs: expand: eager evaluate macros inside builtin macros
- c6c4342273a7 gccrs: testsuite/rust: add a testcase for testing ...
- e1beb624ff5a gccrs: Cleanup formatting of backend expression visitor
- 9c60f0e1e5cd gccrs: Make constexpr constructors type-checking more permissive
- 11a37f895040 gccrs: Fix duplicated function generation on higher ranked trait bounds
- 104cc285533e gccrs: Refactor TypeResolution to be a simple query based system
- d9d7b6ccd45a gccrs: Add testcase to show forward declared items work
- 50335ddd3014 gccrs: Add testcase to show forward declared items work via TypeAlias
This merge is done with 'git merge --strategy=ours', so effectively doesn't
merge any changes. Rationale: those commits are taken from GCC/Rust master
branch, and any remaining changes we'd either like to persist, or assess
individually, later.
Co-authored-by: Thomas Schwinge <thomas@codesourcery.com> Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com> Co-authored-by: Faisal Abbas <90.abbasfaisal@gmail.com> Co-authored-by: Philip Herron <philip.herron@embecosm.com> Co-authored-by: liushuyu <liushuyu011@gmail.com>
In #1847 "Merge upstream, last commit before 2023-01-31 GCC/Rust upstreaming"
we merged commit 9e56306f4d7c15e7667d8ac0b62ae6efb93ba756 from upstream GCC
master branch.
- 5be4c2687a89 gccrs: session-manager: Add ast-pretty-expanded dump
- e66fec8e6ba3 gccrs: const folding port
- ff8a56950776 gccrs: Desugar double borrows into two HIR:BorrowExpr's
- 86743891a6e9 gccrs: backend: Expose Bvariable class through rust-gcc header
- 41547275c5e9 gccrs: builtins: Add add_overflow builtin and refactor class
- 9c87dc0afe05 gccrs: backend: Add overflow checks to every arithmetic operation
- 3a3a352091b7 gccrs: rustc_attrs: Allow `rustc_inherit_overflow_checks` as a builtin..
- 938facc5e93a gccrs: lint: Do not emit unused warnings for public items
- f7014b28b81f gccrs: parser: Parse RangeFullExpr without erroring out
- 1fed030c1651 gccrs: macros: Handle matchers properly in repetitions
- 252216dd0c59 gccrs: transcriber: Do not infinite loop if the current parsed node is an error
- 7dc41901213d gccrs: dump: Add AST debugging using the AST::Dump class
- 55fb35c51b2e gccrs: ast: Only expand expressions and types if the kind is right
- 3663d7ef6662 gccrs: ast: Add better assertion on AST fragments
- 245ce6f26a16 gccrs: Add guards against getting data from an empty vector
- af22b54af53c gccrs: Add missing location info to coercions
- 7ad24d802e59 gccrs: Refactor unify to hit a unify_site
- 1eabeb5aecc9 gccrs: Remove param_use_canonical_types checks ported from c++ front-end
- ffa16a4590ad gccrs: Create canonical process of compiling constant items
- 43cb42a3d82d gccrs: Add extra debugging for method call expressions
- e641158a5f5c gccrs: Add new check for contains_associated_types
- 0fffc0e772d6 gccrs: Unit structs are not concrete when they need substitutions
- 689a5c6711b8 gccrs: bugfix: initialize slice from array in const context
- b0ff1647cbe6 gccrs: add testcase to test component_ref and constructor codes in eval_constant_expression()
- e6a3886a833a gccrs: backend: correctly formulate the exit condition ...
- dd9d6656e9a4 gccrs: add testcase with struct to test component_ref and constructor codes..
- 0d5adf093566 gccrs: testsuite: add loop condition execution test
- 288b6298a6ae gccrs: const generics: Make sure const generic types are visited properly
- ff9d7741d4b9 gccrs: const generics: Forbid default values in Functions, Traits and Impls
- 739d0509ed55 gccrs: attributes: Add #[macro_use] as builtin
- 3736647947b6 gccrs: module lowering: Do not append null pointers as items
- 70fc174b78a2 gccrs: Static Items must be const evaluated
- 408ab8a6e412 gccrs: Statics are a coercion site
- a0c2ea3ee6e4 gccrs: remove bad assertion
- f92f8ee75bf0 gccrs: Add testcase for const-eval issue from rust-blog
- 9d6b434e1fda gccrs: rust: Add -frust-compile-until option
- e88ce5cc6847 gccrs: expand: eager evaluate macros inside builtin macros
- c6c4342273a7 gccrs: testsuite/rust: add a testcase for testing ...
- e1beb624ff5a gccrs: Cleanup formatting of backend expression visitor
- 9c60f0e1e5cd gccrs: Make constexpr constructors type-checking more permissive
- 11a37f895040 gccrs: Fix duplicated function generation on higher ranked trait bounds
- 104cc285533e gccrs: Refactor TypeResolution to be a simple query based system
- d9d7b6ccd45a gccrs: Add testcase to show forward declared items work
- 50335ddd3014 gccrs: Add testcase to show forward declared items work via TypeAlias
This merge is done with 'git merge --strategy=ours', so effectively doesn't
merge any changes. Rationale: those commits are taken from GCC/Rust master
branch, and any remaining changes we'd either like to persist, or assess
individually, later.
bors[bot] [Mon, 13 Feb 2023 11:15:24 +0000 (11:15 +0000)]
Merge #1750
1750: Implement fixed point macro expansion r=CohenArthur a=CohenArthur
This is a cleanup of #1606's branch, which also contains the code necessary for performing eager macro expansion in builtin macros.
This commit changes our macro expansion system from an eager and recursive
macro expansion to a fixed-point like system. Instead of, when seeing
a macro invocation, expanding it and all of the macros within it, we
now perform multiple passes of expansion on the entire crate.
This, however, leads to a problem. Rust macros are expanded lazily, but
Rust builtin macros should be expanded eagerly. Due to this, we must
work around the lazy expansion in builtin macros and perform eager
expansion for each pass of the fixed-point, before finally expanding
the builtin when there are no longer any inner macro invocations.
To perform proper macro scoping, the ENR now keeps track of the current
scope (`current_scope` member) and resolves macros accordingly.
This is done through the use of the `scoped` method, which creates a new
scope, runs a specified lambda and then exits the scope. This prevents
pushing/popping errors that we've seen happen already in similar
contexts.
We might think about generalizing it to other classes, providing a
`Scoped<EntryFn, ExitFn>` class or similar
Fixes #1795
Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
bors[bot] [Fri, 10 Feb 2023 10:17:07 +0000 (10:17 +0000)]
Merge #1810 #1823 #1824 #1837 #1839
1810: fixed indentation in AST pretty printed expanded dump of trait. r=CohenArthur a=00AR
fixes #1785
Signed-off-by: Abdul Rafey <abdulrafeyq@gmail.com>
---
In Dump::visit (TraitImpl), the for loop adds indentation before calling visit () on every iteration. I think when Dump::visit (Method) is executed it adds extra indentation on top of it.
1823: parser: Improve parsing of complex generic arguments r=CohenArthur a=CohenArthur
The parser was missing code for handling complex type arguments such as type paths or nested generics.
gcc/rust/ChangeLog:
* parse/rust-parse-impl.h (Parser::parse_generic_arg): Handle type paths and nested generics properly.
gcc/testsuite/ChangeLog:
* rust/compile/parse_complex_generic_application.rs: New test.
* rust/compile/parse_complex_generic_application2.rs: New test.
1824: parser: Fix parsing of closure param list r=CohenArthur a=CohenArthur
Arthur Cohen [Wed, 18 Jan 2023 11:23:37 +0000 (12:23 +0100)]
macros: Perform macro expansion in a fixed-point fashion.
This commit changes our macro expansion system from an eager and recursive
macro expansion to a fixed-point like system. Instead of, when seeing
a macro invocation, expanding it and all of the macros within it, we
now perform multiple passes of expansion on the entire crate.
This, however, leads to a problem. Rust macros are expanded lazily, but
Rust builtin macros should be expanded eagerly. Due to this, we must
work around the lazy expansion in builtin macros and perform eager
expansion for each pass of the fixed-point, before finally expanding
the builtin when there are no longer any inner macro invocations.
To perform proper macro scoping, the ENR now keeps track of the current
scope (`current_scope` member) and resolves macros accordingly.
This is done through the use of the `scoped` method, which creates a new
scope, runs a specified lambda and then exits the scope. This prevents
pushing/popping errors that we've seen happen already in similar
contexts.
We might think about generalizing it to other classes, providing a
`Scoped<EntryFn, ExitFn>` class or similar
gcc/rust/ChangeLog:
* ast/rust-macro.cc: New file.
* Make-lang.in: Add `rust-macro.o` object
* ast/rust-ast-fragment.cc (Fragment::Fragment): Change API around
the construction of AST fragments.
(Fragment::operator=): Correct `Fragment::operator=` to take into
account the fragment tokens.
(Fragment::create_error): Use new constructor.
(Fragment::complete): Remove in favor of new constructor.
(Fragment::unexpanded): Remove as that Fragment type is no longer used
or possible.
(Fragment::get_tokens): Add helper to access a fragment's tokens.
* ast/rust-ast-fragment.h (enum class): Remove `FragmentKind::Unused`
* ast/rust-ast.cc (MacroInvocation::as_string): Display
builtin macro invocations properly.
* ast/rust-ast.h: Fix `DelimTokenTree` class copy constructors and
handling of its token vector.
* ast/rust-macro.h (class MacroMatcher): Format.
(class MetaItemSeq): Likewise.
(builtin_macro_from_string): Get a `BuiltinMacroKind` from a given
string, i.e the name of the macro (`assert!`, `cfg!` and so on).
* expand/rust-attribute-visitor.cc (AttrVisitor::visit): Do not expand
macros recursively anymore.
(AttrVisitor::maybe_expand_expr): Likewise.
(AttrVisitor::maybe_expand_type): Likewise.
* expand/rust-attribute-visitor.h: Likewise, and remove
`expand_macro_fragment_recursively` function.
* expand/rust-macro-builtins.cc (make_token): Add shorthand for
returning `std::unique_ptr<AST::Token>`s.
(make_macro_invocation): Add shorthand for returning fragments
containing builtin macro invocations.
(try_expand_macro_expression): Do not expand macros recursively.
(try_expand_single_string_literal): Likewise.
(try_expand_many_expr): Likewise.
(parse_single_string_literal): Error out more appropriately.
(MacroBuiltin::file_handler): Return the proper tokens associated with
macro invocation, and builtin macros in the case of necessary eager
expansion.
(MacroBuiltin::column_handler): Likewise.
(MacroBuiltin::include_bytes_handler): Likewise.
(MacroBuiltin::include_str_handler): Likewise.
(MacroBuiltin::concat_handler): Likewise.
(MacroBuiltin::env_handler): Likewise.
(MacroBuiltin::cfg_handler): Likewise.
(MacroBuiltin::include_handler): Likewise.
(MacroBuiltin::line_handler): Likewise.
* expand/rust-macro-expand.cc (MacroExpander::expand_eager_invocations):
Add function to expand eager invocations *once* in the fixed point
pipeline.
(MacroExpander::expand_invoc): Call into `expand_eager_invocations` for
builtin macro invocations.
(MacroExpander::expand_crate): Use new `AttrVisitor` API.
(parse_many): Return tokens in `AST::Fragment`.
(transcribe_expression): Likewise.
(transcribe_type): Likewise.
* expand/rust-macro-expand.h (struct MacroExpander): Add `has_changed`
flag for fixed point checking.
* resolve/rust-early-name-resolver.cc (EarlyNameResolver::EarlyNameResolver):
Keep track of the current macro scope.
(EarlyNameResolver::go): Use `scoped` API.
(EarlyNameResolver::visit): Likewise.
* resolve/rust-early-name-resolver.h: Add `scoped` API.
* rust-session-manager.cc (Session::expansion): Perform macro expansion
in a fixed-point fashion.
gcc/testsuite/ChangeLog:
* rust/compile/macro17.rs: Fix testsuite for new recursion errors.
* rust/compile/macro44.rs: Fix invalid testcase assertions.
* rust/compile/builtin_macro_recurse.rs: Fix invalid test.
* rust/compile/builtin_macro_recurse2.rs: New test.
* rust/compile/macro46.rs: New test.
Arthur Cohen [Wed, 18 Jan 2023 11:23:03 +0000 (12:23 +0100)]
macro: Allow builtin `MacroInvocation`s within the AST
This commit turns AST::MacroInvocation into a sum type.
The class can now represent a regular macro invocation (lazily expanded)
or a builtin one (eagerly expanded)
gcc/rust/ChangeLog:
* expand/rust-macro-builtins.cc (make_macro_invocation): Add short hand
function for returning fragments containing macro invocations.
(MacroBuiltin::compile_error_handler): Add explanation for eager
invocation
Philip Herron [Tue, 31 Jan 2023 18:52:33 +0000 (18:52 +0000)]
gccrs: Fix higher ranked trait bounds computation of self
This updates the higher ranked trait bounds computation to handle ambigious
cases. When we have a slice for example:
let slice = &a[1..3];
This works by reusing the Index operator overload from libcore, so when the
index range of 1..3 is computed, the type system needs to compute what the
types of index are; this works by integer inference variables
Range<<integer>> that need to be unified with the impl Index for
Range<Usize> which computes the real type of usize for the index. This is
fine but what happens when we have the Copy and Clone traits bounds which
have implementations for all the primitive types i8, i16, i32, i64...
which is valid for any integer inference variable so the code prior to this
patch would have grabbed the first impl it would have found and used it
which is incorrect. When we have integer or float inference variables we
need to look for their respective defaults or emit an ambigious type bound
error.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
gcc/rust/ChangeLog:
Philip Herron [Tue, 31 Jan 2023 14:27:49 +0000 (14:27 +0000)]
gccrs: Fix nullptr dereference
When we check if this is concrete the guard checks to ensure the argument
is non null but the check here is wrongly returning early when the check
is non null meaning when it is null and therefore not concrete it will
end up doing a null dereference.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
gcc/rust/ChangeLog:
Philip Herron [Mon, 30 Jan 2023 18:19:07 +0000 (18:19 +0000)]
gccrs: Refactor the type unification code
This refactors the unification systems to be a consistent interface using
switch statements and simple functions instead of the old clunky visitor
system. This is more maintainable as it is harder to miss cases when we
can take advantages of switch statements.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
gcc/rust/ChangeLog:
Philip Herron [Fri, 27 Jan 2023 15:38:58 +0000 (15:38 +0000)]
gccrs: Remove monomorphization hack to setup possible associated types
During CallExpr argument type checking we may be calling a default
implementation of a trait function this will require any possible
associated types to be resolved and setup. This monomoprhization call does
this but it will premtivly do extra unification of types which will throw
off type checking later on. This fix is required for my work into type
bounds checking.
Fixes #1773
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
gcc/rust/ChangeLog:
Philip Herron [Fri, 27 Jan 2023 18:31:11 +0000 (18:31 +0000)]
gccrs: Clear the substitution callbacks when copying ArgumentMappings
When we set the callback on substitutions this is not safe to be copied
around since we store the used argument mappings and can reuse them in
different contexts. This clears the callback on copy's to make it safer.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
gcc/rust/ChangeLog:
Philip Herron [Fri, 27 Jan 2023 18:28:06 +0000 (18:28 +0000)]
gccrs: Refactor handle_substitutions to take a reference
This patch changes the recusive substitution code to take a reference
instead of a copy. This is important as the callback field is going to be
made non-copyable in a future patch and this pipeline is for recursive
substitutions so its ok to reuse the same mappings here.
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
gcc/rust/ChangeLog:
bors[bot] [Fri, 3 Feb 2023 13:28:26 +0000 (13:28 +0000)]
Merge #1698
1698: update the ubuntu version r=CohenArthur a=ArshErgon
Fixes: #1689
updated the ubuntu-version from 20.04 to 22.04
Thank you for making Rust GCC better!
If your PR fixes an issue, you can add "Fixes #issue_number" into this
PR description and the git commit message. This way the issue will be
automatically closed when your PR is merged. If your change addresses
an issue but does not fully fix it please mark it as "Addresses #issue_number"
in the git commit message.
Here is a checklist to help you with your PR.
- \[ ] GCC development requires copyright assignment or the Developer's Certificate of Origin sign-off, see https://gcc.gnu.org/contribute.html or https://gcc.gnu.org/dco.html
- \[ ] Read contributing guidlines
- \[ ] `make check-rust` passes locally
- \[ ] Run `clang-format`
- \[ ] Added any relevant test cases to `gcc/testsuite/rust/`
Note that you can skip the above if you are just opening a WIP PR in
order to get feedback.
---
*Please write a comment explaining your change. This is the message
that will be part of the merge commit.
The parser now recursively tries to parse a reference type after seeing a `&` or `&&` token.
gcc/rust/ChangeLog:
* parse/rust-parse-impl.h (Parser::parse_type): Handle double ampersan properly (Parser::parse_reference_type): Call into `parse_reference_type_inner` and wrap double reference types in another `AST::ReferenceType` node (Parser::parse_reference_type_inner): Add parsing implementation which does not care about the leading token (& or &&) (Parser::parse_type_no_bounds): Handle double ampersand properly
* parse/rust-parse.h: Declare `parse_reference_type_inner`
gcc/testsuite/ChangeLog:
* rust/compile/multi_reference_type.rs: New test.
Addresses #1807 partly
Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
Last we did #1700 "Merge upstream, last commit before GCC/Rust upstreaming",
which merged commit b4fddbe9592e9feb37ce567d90af822b75995531 from GCC upstream
master branch.
- dd950cbbb97 Use DW_ATE_UTF for the Rust 'char' type
- b772a504eff gccrs: Add necessary hooks for a Rust front-end testsuite
- 4b8f3005af0 gccrs: Add Debug info testsuite
- f60df7e6202 gccrs: Add link cases testsuite
- 97705b4459b gccrs: Add general compilation test cases
- 5a56869d6e3 gccrs: Add execution test cases
- dc4171edb3c gccrs: Add gcc-check-target check-rust
- 6b35ae12ce9 gccrs: Add Rust front-end base AST data structures
- 438ae944fa6 gccrs: Add definitions of Rust Items in AST data structures
- d588754c826 gccrs: Add full definitions of Rust AST data structures
- 5b981e9c741 gccrs: Add Rust AST visitors
- 18f6990f842 gccrs: Add Lexer for Rust front-end
- 35e4f3b4af4 gccrs: Add Parser for Rust front-end pt.1
- 32c8fb0eeaf gccrs: Add Parser for Rust front-end pt.2
- 1841081a8a3 gccrs: Add expansion pass for the Rust front-end
- 85a8fe00f80 gccrs: Add name resolution pass to the Rust front-end
- 8ad1d56d68a gccrs: Add declarations for Rust HIR
- 7641eaead40 gccrs: Add HIR definitions and visitor framework
- 7999cf327de gccrs: Add AST to HIR lowering pass
- b32b1b1576a gccrs: Add wrapper for make_unique
- c7f8347e83c gccrs: Add port of FNV hash used during legacy symbol mangling
- 15b0278905e gccrs: Add Rust ABI enum helpers
- eb10bc5225e gccrs: Add Base62 implementation
- 9a4fee5f57c gccrs: Add implementation of Optional
- 2e7fc8780e0 gccrs: Add attributes checker
- 9ce37e72062 gccrs: Add helpers mappings canonical path and lang items
- c6c3db21769 gccrs: Add type resolution and trait solving pass
- 24393cb68fa gccrs: Add Rust type information
- 06688fe40a2 gccrs: Add remaining type system transformations
- b1b35204d8a gccrs: Add unsafe checks for Rust
- 5215235f016 gccrs: Add const checker
- ca246e573fb gccrs: Add privacy checks
- 520b52b24e7 gccrs: Add dead code scan on HIR
- 4d67468d1d4 gccrs: Add unused variable scan
- 509e4c32c6a gccrs: Add metadata output pass
- 15f04af347e gccrs: Add base for HIR to GCC GENERIC lowering
- 019b2f15581 gccrs: Add HIR to GCC GENERIC lowering for all nodes
- cfbda2f78ba gccrs: Add HIR to GCC GENERIC lowering entry point
- fe6264fa28a gccrs: These are wrappers ported from reusing gccgo
- bba14a0790f gccrs: Add compiler driver
- ea34614225d gccrs: Compiler proper interface kicks off the pipeline
- ab1e0db43c2 gccrs: Add lang-spec.h
- 5e7d199739f gccrs: Add lang.opt
- 88415d33bb3 gccrs: Add GCC Rust front-end Make-lang.in
- b07ef39ffbf gccrs: Add fatal_error when experimental flag is not present
- a75f038c069 gccrs: Add config-lang.in
- edc676cfe89 gccrs: Add README, CONTRIBUTING and compiler logo
This merge is done with `git merge --strategy=ours`, so that we effectively
don't bring any changes. Rationale: any changes due to upstream review etc.,
have already been applied individually to GCC/Rust master branch, and any
remaining changes we'd either like to persist, or assess individually, later.
Co-authored-by: Tom Tromey <tom@tromey.com> Co-authored-by: Philip Herron <philip.herron@embecosm.com> Co-authored-by: Joel Phillips <simplytheother@gmail.com> Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
Arthur Cohen [Wed, 1 Feb 2023 10:40:13 +0000 (11:40 +0100)]
parser: Allow parsing multiple reference types
The parser now recursively tries to parse a reference type after seeing
a `&` or `&&` token.
gcc/rust/ChangeLog:
* parse/rust-parse-impl.h (Parser::parse_type): Handle double ampersan
properly
(Parser::parse_reference_type): Call into `parse_reference_type_inner`
and wrap double reference types in another `AST::ReferenceType` node
(Parser::parse_reference_type_inner): Add parsing implementation
which does not care about the leading token (& or &&)
(Parser::parse_type_no_bounds): Handle double ampersand properly
* parse/rust-parse.h: Declare `parse_reference_type_inner`
Last we did #1700 "Merge upstream, last commit before GCC/Rust upstreaming",
which merged commit b4fddbe9592e9feb37ce567d90af822b75995531 from GCC upstream
master branch.
- dd950cbbb97 Use DW_ATE_UTF for the Rust 'char' type
- b772a504eff gccrs: Add necessary hooks for a Rust front-end testsuite
- 4b8f3005af0 gccrs: Add Debug info testsuite
- f60df7e6202 gccrs: Add link cases testsuite
- 97705b4459b gccrs: Add general compilation test cases
- 5a56869d6e3 gccrs: Add execution test cases
- dc4171edb3c gccrs: Add gcc-check-target check-rust
- 6b35ae12ce9 gccrs: Add Rust front-end base AST data structures
- 438ae944fa6 gccrs: Add definitions of Rust Items in AST data structures
- d588754c826 gccrs: Add full definitions of Rust AST data structures
- 5b981e9c741 gccrs: Add Rust AST visitors
- 18f6990f842 gccrs: Add Lexer for Rust front-end
- 35e4f3b4af4 gccrs: Add Parser for Rust front-end pt.1
- 32c8fb0eeaf gccrs: Add Parser for Rust front-end pt.2
- 1841081a8a3 gccrs: Add expansion pass for the Rust front-end
- 85a8fe00f80 gccrs: Add name resolution pass to the Rust front-end
- 8ad1d56d68a gccrs: Add declarations for Rust HIR
- 7641eaead40 gccrs: Add HIR definitions and visitor framework
- 7999cf327de gccrs: Add AST to HIR lowering pass
- b32b1b1576a gccrs: Add wrapper for make_unique
- c7f8347e83c gccrs: Add port of FNV hash used during legacy symbol mangling
- 15b0278905e gccrs: Add Rust ABI enum helpers
- eb10bc5225e gccrs: Add Base62 implementation
- 9a4fee5f57c gccrs: Add implementation of Optional
- 2e7fc8780e0 gccrs: Add attributes checker
- 9ce37e72062 gccrs: Add helpers mappings canonical path and lang items
- c6c3db21769 gccrs: Add type resolution and trait solving pass
- 24393cb68fa gccrs: Add Rust type information
- 06688fe40a2 gccrs: Add remaining type system transformations
- b1b35204d8a gccrs: Add unsafe checks for Rust
- 5215235f016 gccrs: Add const checker
- ca246e573fb gccrs: Add privacy checks
- 520b52b24e7 gccrs: Add dead code scan on HIR
- 4d67468d1d4 gccrs: Add unused variable scan
- 509e4c32c6a gccrs: Add metadata output pass
- 15f04af347e gccrs: Add base for HIR to GCC GENERIC lowering
- 019b2f15581 gccrs: Add HIR to GCC GENERIC lowering for all nodes
- cfbda2f78ba gccrs: Add HIR to GCC GENERIC lowering entry point
- fe6264fa28a gccrs: These are wrappers ported from reusing gccgo
- bba14a0790f gccrs: Add compiler driver
- ea34614225d gccrs: Compiler proper interface kicks off the pipeline
- ab1e0db43c2 gccrs: Add lang-spec.h
- 5e7d199739f gccrs: Add lang.opt
- 88415d33bb3 gccrs: Add GCC Rust front-end Make-lang.in
- b07ef39ffbf gccrs: Add fatal_error when experimental flag is not present
- a75f038c069 gccrs: Add config-lang.in
- edc676cfe89 gccrs: Add README, CONTRIBUTING and compiler logo
This merge is done with `git merge --strategy=ours`, so that we effectively
don't bring any changes. Rationale: any changes due to upstream review etc.,
have already been applied individually to GCC/Rust master branch, and any
remaining changes we'd either like to persist, or assess individually, later.
bors[bot] [Tue, 31 Jan 2023 21:46:24 +0000 (21:46 +0000)]
Merge #1788
1788: ci: Add commit format checker r=CohenArthur a=CohenArthur
Bring over the commit checker from `gcc-patch-dev` with the `gccrs` prefix checker enabled only for `gcc-patch-dev` PRs. I'll open up an issue to make sure that in the future it's easier to keep that folder in sync between the two branches
Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
Philip Herron [Mon, 16 Jan 2023 11:36:53 +0000 (12:36 +0100)]
gccrs: Refactor TypeResolution to be a simple query based system
This patch refactors the type resolution system to introduce a new
interface
bool query_type (HirId, TyTy::BaseType** result)
This is needed in order to properly support forward declared items. Our
name resolution system has two parts:
1. Toplevel scan
2. Item resolution
The toplevel scan gathers all the nesseacry 'names' into their respective
namespace by doing a full toplevel scan and generate canonical paths for
each item. The second pass is responsible for drilling down into each
structure or function to resolve each field or variable etc. This means
our name resolution system supports forward decalred items but our type
resolution system did not.
This patch removes the toplevel scan from our type resolution pass which
is not able to handle all cases such as a function with return type and
the type is decalred after the fact or a type alias to a type declared
after the fact. The name resolution mappings are resolved so when errors
occured here we got errors such as unable to lookup HirId 1234, which meant
yes we have 'resolved' this reference to this HirId but we are unable to
find any type information for it. This means we needed a new way to figure
out the type in a query based way.
This is where the new query_type inferface comes in so when we have an
HirId we want to resolve the mappings class allows us to figure out what
item this is such as:
1. HIR::Item (normal HIR::Function, Struct, TypeAlias, ...)
2. HIR::ImplItem (function, constant, ... within an impl-block)
3. HIR::ImplBlock (Self type on an impl-block)
4. HIR::ExternalItem (extern-block item)
The mappings class allows us to simply lookup these HIR nodes and then
call the relevant resolver class to compute the type. This patch does not
add support for self-referencial types but is the starting point to be able
to support such types.
Fixes #1455
gcc/rust/ChangeLog:
* Make-lang.in: Remove `rust-hir-typecheck-toplevel` object and add
`rust-hir-path-probe` one.
* typecheck/rust-hir-dot-operator.cc (MethodResolver::MethodResolver):
Remove no longer used `context` and `mapping` fields, and use new
`query_type` API.
(MethodResolver::MethodResolver): Likewise.
(MethodResolver::select): Use new `query_type` API.
* typecheck/rust-hir-path-probe.h: New header.
* typecheck/rust-hir-path-probe.cc: New file.
* typecheck/rust-hir-dot-operator.h (class MethodResolver): Remove no
longer used `context` and `mapping` fields, and use new `query_type` API.
* typecheck/rust-hir-type-check-base.cc (TypeCheckBase::query_type): New function.
* typecheck/rust-hir-type-check-base.h: Declare `query_type` function.
* typecheck/rust-hir-type-check-expr.cc (TypeCheckExpr::visit): Add debug print.
* typecheck/rust-hir-type-check-implitem.cc (TypeCheckTopLevelExternItem::Resolve):
Refactor and make use of new query system.
(TypeCheckTopLevelExternItem::Resolve): Likewise.
(TypeCheckTopLevelExternItem::visit): Likewise.
(TypeCheckTopLevelImplItem::visit): Likewise.
(TypeCheckImplItem::visit): Likewise.
(TypeCheckImplItem::TypeCheckImplItem): Likewise.
(TypeCheckImplItem::Resolve): Likewise.
(TypeCheckImplItemWithTrait::visit): Likewise.
* typecheck/rust-hir-type-check-implitem.h (class TypeCheckTopLevelImplItem): Likewise.
(class TypeCheckImplItemWithTrait): Likewise.
* typecheck/rust-hir-type-check-item.cc (TypeCheckItem::TypeCheckItem): Likewise.
(TypeCheckItem::Resolve): Likewise.
(TypeCheckItem::ResolveImplItem): Likewise.
(TypeCheckItem::ResolveImplBlockSelf): Likewise.
(TypeCheckItem::visit): Likewise.
(TypeCheckItem::resolve_impl_item): Likewise.
(TypeCheckItem::resolve_impl_block_substitutions): Likewise.
(TypeCheckItem::resolve_impl_block_self): Likewise.
* typecheck/rust-hir-type-check-item.h: Likewise.
* typecheck/rust-hir-type-check-path.cc (TypeCheckExpr::resolve_root_path): Likewise.
(TypeCheckExpr::resolve_segments): Likewise.
* typecheck/rust-hir-type-check-stmt.cc (TypeCheckStmt::visit): Likewise.
* typecheck/rust-hir-type-check-stmt.h: Likewise.
* typecheck/rust-hir-type-check-type.cc (TypeCheckType::Resolve): Likewise.
(TypeCheckType::visit): Likewise.
(TypeCheckType::resolve_root_path): Likewise.
* typecheck/rust-hir-type-check.cc (TypeResolution::Resolve): Likewise.
* typecheck/rust-hir-type-check.h: Likewise.
* typecheck/rust-substitution-mapper.h: Likewise.
* typecheck/rust-tyty-bounds.cc (TypeBoundsProbe::scan): Likewise.
(TypeCheckBase::get_predicate_from_bound): Likewise.
(TypeBoundsMappings::add_bound): Likewise.
* typecheck/rust-tyty-cmp.h: Likewise.
* typecheck/rust-tyty.h: Likewise.
* typecheck/rust-tyty.cc (SubstitutionRef::infer_substitions): Likewise.
(ParamType::resolve): Do not infinite loop anymore.
* util/rust-hir-map.h: Add new `hirImplBlockTypeMappings` and
declare `lookup_impl_block_type`.
* util/rust-hir-map.cc (Mappings::insert_hir_impl_block): Use new
`hirImplBlockTypeMappings`
(Mappings::lookup_impl_block_type): New function.
gcc/testsuite/ChangeLog:
* rust/compile/const_generics_5.rs: Fix assertions.
* rust/compile/unconstrained_type_param.rs: Add more assertions.
Philip Herron [Tue, 27 Sep 2022 11:19:43 +0000 (12:19 +0100)]
gccrs: Fix duplicated function generation on higher ranked trait bounds
Deuplicate function elimination can fail when we compile helpers during
higher ranked trait bound monomorphization. This because the
TyTy::BaseType info can be lost/reset during the compilation process. This
adds a second mechanism to match based on the manged names which is a bit
more reliable. This patch is required since the query based refactor of
the type system so this issue was likely hidden to to using duplicated type
info for higher ranked trait bounds.
gcc/rust/ChangeLog:
* backend/rust-compile-context.h: Add new optional `asm_name` string
argument to `lookup_function_decl`.
* backend/rust-compile-item.cc (CompileItem::visit): Compute assembly
name and pass it to `lookup_function_decl` when calling it.
Arthur Cohen [Wed, 31 Aug 2022 11:53:28 +0000 (13:53 +0200)]
gccrs: rust: Add -frust-compile-until option
This option helps ensure that we do not introduce regressions on various
parts of the compilation pipeline. For example, a testcase (or testsuite
from the `testing` project) might pass attribute checking, expansion and
lowering, but fail during typechecking. Should a change suddenly make
that testcase fail expansion, we would not be able to notice it. By
generating tests that run up until expansion, typechecking, compilation
and so forth we ensure that no regressions are added accidentally to
already failing tests/testsuites.
gcc/rust/ChangeLog:
* lang.opt: Add new ``-frust-compile-until` option.
* rust-session-manager.cc (Session::compile_crate): Add stops around
various compilation steps in the pipeline.
* rust-session-manager.h (struct CompileOptions): Add `CompileStep` enum
and field.