Commit Graph

192716 Commits

Author SHA1 Message Date
Philip Herron 69d6fddcbb Allow substitutions to be handled on primitive types without causing unreachable 2022-04-11 11:44:59 +01:00
Philip Herron 0e7eef6556 Make the can equal interface more permissive with associated types 2022-04-11 11:44:59 +01:00
Philip Herron e7e6527975 Add missing const for get_locus and helper to get used arguments 2022-04-11 11:44:59 +01:00
Philip Herron 68458036c8 Disable failing testcase
This commit fed5a41fb1 introduced the concat
builtin macro but the error handling here is producing an infinite loop
which was not caught during code-review. This patch disables the offending
error cases so that it does not impact further development.

Addresses #1102
2022-04-11 11:31:14 +01:00
bors[bot] 1b8d4521db
Merge #1091
1091: Add -frust-edition flag and possible values r=CohenArthur a=CohenArthur

Closes #1072 

Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
2022-04-11 09:41:23 +00:00
bors[bot] 2669e80c17
Merge #1090 #1097 #1098 #1099 #1101
1090: macros: add concat! macro r=philberty a=liushuyu

- extracts parenthesis-matching logic into a function
- adds `concat!` macro

1097: Support mangling *const ptr and slices like *const [T] r=philberty a=philberty

The legacy mangling scheme needs to convert the canonical path containing
* for pointers and the [] brackets representing slices into:

  * = $BP$
  [ = $u5b$
  ] = $u5d$

These symbols are not allowed in asm symbols.

Addresses #849


1098: Ensure unsize method resolutions actually unsize r=philberty a=philberty

This was a typo when unsized method resolution was added, where the
adjustment was wrongly marked as an indirection. The enum is required so
that the code generation adjustment takes place.

Addresses #849

1099: Fix bad inherent overlap error r=philberty a=philberty

When we examine HIR::ImplBlock's we determine if an impl might overlap
another impl based on the Self type. So for example you might have a
generic structure Foo<T>(T), and an associated impl block for Foo<i32>, but
then go on to define an associated impl of Foo<T> the generic one will
overlap any associated impl hiding the generic implementation.

In this case we have two generic impl blocks

  *const [T]
  *const T

This means the *const T might overlap with the slice one since it is
generic. As bjorn3 pointed out in #1075 , the correct implementation is to
observe that [T] is constrained by size but untill we have the auto trait
of Sized we must example the two generic impls and just determine that
they are not-equal so for now this is the best implementation we can do.

Fixes #1075 


1101: Add helper as_string for DefIds r=philberty a=philberty

This just adds a useful helper to as_string DefId's directly

Co-authored-by: liushuyu <liushuyu011@gmail.com>
Co-authored-by: Philip Herron <philip.herron@embecosm.com>
2022-04-11 09:10:22 +00:00
Philip Herron 3513fa38f2
Update gcc/rust/util/rust-mapping-common.h
Co-authored-by: CohenArthur <arthur.cohen@embecosm.com>
2022-04-11 09:56:14 +01:00
Philip Herron 4413bc0cf8 Fix bad inherent overlap error
When we examine HIR::ImplBlock's we determine if an impl might overlap
another impl based on the Self type. So for example you might have a
generic structure Foo<T>(T), and an associated impl block for Foo<i32>, but
then go on to define an associated impl of Foo<T> the generic one will
overlap any associated impl hiding the generic implementation.

In this case we have two generic impl blocks

  *const [T]
  *const T

This means the *const T might overlap with the slice one since it is
generic. As bjorn3 pointed out in #1075, the correct implementation is to
observe that [T] is constrained by size but untill we have the auto trait
of Sized we must example the two generic impls and just determine that
they are not-equal so for now this is the best implementation we can do.

Fixes #1075
2022-04-11 09:47:22 +01:00
bors[bot] e5281ee490
Merge #1100
1100: Add known lang item const_slice_ptr mappings r=philberty a=philberty

This will allow us to define the const_slice_ptr lang item attribute
without erroring out as an unknown lang item.

Addresses #849 

Co-authored-by: Philip Herron <philip.herron@embecosm.com>
2022-04-11 08:43:48 +00:00
liushuyu fed5a41fb1
macros: add concat! macro
Signed-off-by: Zixing Liu <liushuyu011@gmail.com>
2022-04-11 02:31:17 -06:00
Philip Herron b1f42c38f5 Add helper as_string for DefIds 2022-04-09 22:26:42 +01:00
Philip Herron 595eb9c411 Add known lang item const_slice_ptr mappings
This will allow us to define the const_slice_ptr lang item attribute
without erroring out as an unknown lang item.
2022-04-09 22:17:39 +01:00
Philip Herron 8d3184e822 Ensure unsize method resolutions actually unsize
This was a typo when unsized method resolution was added, where the
adjustment was wrongly marked as an indirection. The enum is required so
that the code generation adjustment takes place.

Addresses #849
2022-04-09 21:56:46 +01:00
Philip Herron 6fb118f3e2 Support mangling *const ptr and slices like *const [T]
The legacy mangling scheme needs to convert the canonical path containing
* for pointers and the [] brackets representing slices into:

  * = $BP$
  [ = $u5b$
  ] = $u5d$

These symbols are not allowed in asm symbols.

Addresses #849
2022-04-09 21:53:06 +01:00
bors[bot] e43a5c5373
Merge #1092
1092: gcc/rust/Make-lang.in: add missing rust compiler driver r=philberty a=RomainNaour

When building gccrs with Buildroot toolchain infrastructure, the gccrs
compiler driver is missing when intalling gcc.

This is due to missing depedency on gccrs$(exeext) in rust.all.cross
target.

With that fixed, the gcc toolchain with Rust support is correctly installed into Buildroot:

$ ./test/gccrs/host/bin/aarch64-linux-gccrs --version
aarch64-linux-gccrs (Buildroot 2022.02-442-g54d638fbd1-dirty) 12.0.1 20220118 (experimental)

Note: We probably needs gccrs-cross target like other supported languages.

Copyright assignment signed between Smile and the FSF to contribute to GNU tools.

Co-authored-by: Romain Naour <romain.naour@smile.fr>
2022-04-08 09:11:01 +00:00
Arthur Cohen 46e0068fc0 options: Add -frust-edition flag and possible values
Co-authored-by: liushuyu <liushuyu011@gmail.com>
2022-04-08 11:09:13 +02:00
bors[bot] da3d59db1f
Merge #1087
1087: Use loop to initialize repeat arrays r=philberty a=dafaust

This PR changes how we compile initializers for arrays of repeating elements. I use the same approach outlined in the comments of the linked issue, with some tweaks. It is very similar to how the D language front-end compiles, the new function `Gcc_backend::array_initializer` is heavily inspired by the D front-end's `build_array_set`

This fixes the issue where the compiler tries to allocate a vec containing all elements of the array to be constructed, and therefore explodes on huge constructions (e.g. `let x = [0u8; 4 * 1024 * 1024 * 1024 * 1024]`)

However, we can only initialize non-const arrays in this way. For arrays in const contexts we must initialize them at compile time, and therefore continue using the old method.

Fixes: #1068 


Co-authored-by: David Faust <david.faust@oracle.com>
2022-04-08 08:30:30 +00:00
Romain Naour 83681c3990 gcc/rust/Make-lang.in: add missing rust compiler driver
When building gccrs with Buildroot toolchain infrastructure, the gccrs
compiler driver is missing when intalling gcc.

This is due to missing depedency on gccrs$(exeext) in rust.all.cross
target.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
We probably needs gccrs-cross target like other supported languages.
2022-04-08 09:28:23 +02:00
David Faust 5559bdc866 Emit loop initializer for repeat arrays
This commit changes how arrays of repeating elements, e.g. [5; 12] are
compiled. Rather than create a constructor which explicitly initializes
each element to the given value (which causes compiler OOM for large
arrays), we emit instructions to allocate the array then initialize the
elements in a loop.

However, we can only take this approach outside of const contexts -
const arrays must still use the old approach.
2022-04-07 09:57:46 -07:00
bors[bot] b829e7c0a2
Merge #1080
1080: macros: add compile_error! macro r=CohenArthur a=liushuyu

- Added `compile_error` macro


Co-authored-by: liushuyu <liushuyu011@gmail.com>
2022-04-07 08:16:07 +00:00
bors[bot] 779de323f3
Merge #1083
1083: bugfix: fix several minor issues r=CohenArthur a=liushuyu

- Fixed `-frust-crate= option` got incorrectly overridden by a default value (`example`)
- Fix a minor typo in `gcc/rust/ast/rust-ast-full-test.cc`

Co-authored-by: liushuyu <liushuyu011@gmail.com>
2022-04-06 11:00:42 +00:00
liushuyu af14ad6056
rust-ast-full-test: fix a minor typo
Signed-off-by: Zixing Liu <liushuyu011@gmail.com>
2022-04-05 17:46:29 -06:00
liushuyu 6d42548da9
rust-session-manager: fix an issue where ...
... the -frust-crate= option got incorrectly overridden by a default
value

Signed-off-by: Zixing Liu <liushuyu011@gmail.com>
2022-04-05 17:46:19 -06:00
liushuyu 35570ae410
macros: add compile_error! macro
addresses #927

Signed-off-by: Zixing Liu <liushuyu011@gmail.com>
2022-04-03 17:17:33 -06:00
bors[bot] 9011184f38
Merge #1071
1071: Allow transcribing of zero nodes in certain cases r=CohenArthur a=CohenArthur

When expanding AST fragments containing multiple nodes, we must be aware
that some cases allow expanding zero or more nodes. Any macro
transcription that gets parsed as many nodes (ie any transcriber function that calls `parse_many`) needs to be able to parse zero of those nodes and still get expanded properly (basically, removed).

Previously, this would cause a failure to lower the macro invocation which would remain as a child instead of getting stripped/erased.



Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
2022-03-31 09:56:35 +00:00
Arthur Cohen 73532817fd macros: Allow transcribing of zero items
When expanding AST fragments containing multiple nodes, we must be aware
that some cases allow expanding zero or more nodes. Any macro
transcription that gets parsed as many nodes (ie any transcriber function that calls `parse_many`) needs to be able to parse zero of those nodes and still get expanded properly (basically, removed).

Previously, this would cause a failure to lower the macro invocation which would remain as a child instead of getting stripped/erased.

Co-authored-by: philberty <philip.herron@embecosm.com>
2022-03-31 11:32:26 +02:00
bors[bot] f9c1a14dab
Merge #1069
1069: Handle macro invocations in type contexts r=CohenArthur a=CohenArthur

Closes #1067 

This highlighted two issues where parsing types is not entirely correct, which I'll raise. The code necessary to handle macro invocations in these two places should already be implemented. 

Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
2022-03-31 08:28:42 +00:00
Arthur Cohen 6bf428379d macros: Expand macro invocation properly in type contexts
Macro invocations can be present where the language expects types. Thus,
we need to add a new type of parsing context, a new transcriber, as well
as a new way to extract types from the AST Fragments. This adds a lot of
"expansion places" in the attribute visitor, as types can be present in
a wide variety of constructs
2022-03-31 09:42:26 +02:00
Arthur Cohen 3413f632ec ast_fragment: Add take_type_fragment() method
Co-authored-by: philberty <philip.herron@embecosm.com>
2022-03-31 09:42:26 +02:00
Arthur Cohen b6bbf1fa72 macro_transcriber: Add TYPE context and associated transcriber 2022-03-31 09:42:08 +02:00
Arthur Cohen 229512d662 single_ast_node: Fix typo in as_string() method 2022-03-31 09:42:08 +02:00
Arthur Cohen cf94fd8d51 single_ast_node: Add TYPE kind 2022-03-31 09:42:08 +02:00
bors[bot] bd1f435b23
Merge #1059
1059: Add base for build job using older GCC version r=CohenArthur a=CohenArthur

Fixes #1058 

Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
2022-03-30 11:14:40 +00:00
Arthur Cohen e824a0835b ci: Run tests with gccrs compiled under gcc-4.8 2022-03-29 10:22:53 +02:00
bors[bot] e8b9587d3a
Merge #1045
1045: Add initial support for unsized method resolution r=philberty a=philberty

In order to support slices, we end up with an operator overload call of:

```
impl<T, I> Index<I> for [T]
where
    I: SliceIndex<[T]>,
{
    type Output = I::Output;

    fn index(&self, index: I) -> &I::Output {
        index.index(self)
    }
}
```

So this means the self, in this case, is an array[T,capacity] and the index parameter is of type Range<usize>. In order to actually call this method
which has a self parameter of [T] we need to be able to 'unsize' the array
into a slice.

Addresses #849


Co-authored-by: Philip Herron <philip.herron@embecosm.com>
2022-03-28 14:22:24 +00:00
bors[bot] 729bbacbd1
Merge #1066
1066: Fix warning of uninitialized delim_id variable r=CohenArthur a=CohenArthur



Co-authored-by: CohenArthur <arthur.cohen@epita.fr>
2022-03-27 14:15:10 +00:00
CohenArthur 1f8780be70 is_match_compatible: Fix warning of uninitialized delim_id variable
Since all cases in the switch were handled, this was not really a
problem. Still, we should avoid those in case we need to add
delimiters at some point

Co-authored-by: Thomas Schwinge <thomas@schwinge.name>
2022-03-27 14:46:40 +02:00
bors[bot] 5a15694ee2
Merge #1063
1063: Handle :meta fragments properly r=CohenArthur a=CohenArthur

This expands :meta fragments properly and allows us to strip assignment expressions

Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
2022-03-25 11:46:24 +00:00
bors[bot] a7e7234692
Merge #1055
1055: Allow keeping list of last matches to check against r=CohenArthur a=CohenArthur

When trying to figure out if a match can follow another, we must figure
out whether or not that match is in the follow-set of the other. If that
match is zeroable (i.e a repetition using the * or ? kleene operators),
then we must be able to check the match after them: should our current
match not be present, the match after must be part of the follow-set.
This commits allows us to performs such checks properly and to "look
past" zeroable matches. This is not done with any lookahead, simply by
keeping a list of pointers to possible previous matches and checking all
of them for ambiguities.

Addresses #947 
Closes #947 

Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
2022-03-25 10:23:43 +00:00
Arthur Cohen 7fa6e72b1a macros: Parse :meta properly
This allows us to match attribute bodies in macro invocations, which we
can use later down the line to perform conditional compilation
2022-03-25 11:22:18 +01:00
Arthur Cohen 6c99a5a8f1 parser: Move outer attrs properly intoto AssignmentExpr
AssignmentExpressions could not access their outer attributes properly,
since they were being eagerly moved into the `IdentifierExpr` type they
are based on. The base `OperatorExpr` class would thus end up with an
empty vector of outer attributes
2022-03-25 11:22:17 +01:00
Arthur Cohen 2249a4d512 attributes: Allow stripping assignment expressions 2022-03-25 11:22:17 +01:00
Arthur Cohen 7ea35487a2 macros: Allow checking past zeroable matches for follow-set restrictions
When trying to figure out if a match can follow another, we must figure
out whether or not that match is in the follow-set of the other. If that
match is zeroable (i.e a repetition using the * or ? kleene operators),
then we must be able to check the match after them: should our current
match not be present, the match after must be part of the follow-set.
This commits allows us to performs such checks properly and to "look
past" zeroable matches. This is not done with any lookahead, simply by
keeping a list of pointers to possible previous matches and checking all
of them for ambiguities.
2022-03-25 10:28:42 +01:00
bors[bot] 89ad4f21f2
Merge #1062
1062: Properly perform follow set checking on matcher r=CohenArthur a=CohenArthur

Addresses #947 

Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
2022-03-25 07:55:29 +00:00
bors[bot] 0fa882160d
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>
2022-03-24 16:54:54 +00:00
David Faust 261c753e56 macros: implement include_bytes! and include_str! 2022-03-24 08:59:35 -07:00
bors[bot] 3a90596517
Merge #1054
1054: Fix overzealous follow set ambiguity r=CohenArthur a=CohenArthur

When checking if a follow-up is valid, we previously always returned
false when comparing with MacroMatchRepetitions. This is however
invalid, as we should be comparing with the first match of the
repetition to be sure.

Closes #1053 
Addresses #947 

Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
2022-03-24 15:58:07 +00:00
Arthur Cohen 5651331236 macros: Allow parsing :tt fragments
: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
2022-03-24 15:03:20 +01:00
Arthur Cohen 912b04216d macros: Check follow-set restrictions on matcher's first delimiter 2022-03-24 13:56:23 +01:00
Arthur Cohen d859ab0146 macros: Allow repetitions of tokens in follow-set in follow-set
When checking if a follow-up is valid, we previously always returned
false when comparing with MacroMatchRepetitions. This is however
invalid, as we should be comparing with the first match of the
repetition to be sure.
2022-03-24 13:07:22 +01:00