public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] Merge #1355
@ 2022-07-07 11:35 Thomas Schwinge
  0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2022-07-07 11:35 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:c8a9218a5bab48fffe1f5fa02244954d55f8945c

commit c8a9218a5bab48fffe1f5fa02244954d55f8945c
Merge: ad0e01dfbba 1f32e5b4558
Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Date:   Thu Jul 7 09:34:02 2022 +0000

    Merge #1355
    
    1355: Ambiguous generic arg r=CohenArthur a=CohenArthur
    
    Needs #1354. Only review the last commit :)
    
    ast: Rename ConstGenericArg -> GenericArg
    
    This makes the class clearer and exposes the fact that it may contain a
    type OR a const value clearer.
    
    Because we now run in ambiguous cases later in the compiler pipeline,
    this commit also adds horrible hacks to simply ignore ambiguous generic
    arguments and treat them as type arguments.
    
    
    
    Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>

Diff:

 gcc/rust/ast/rust-ast-full-test.cc             |  47 ++++---
 gcc/rust/ast/rust-path.h                       | 172 ++++++++++++++-----------
 gcc/rust/expand/rust-attribute-visitor.cc      |  21 ++-
 gcc/rust/hir/rust-ast-lower-base.cc            |  41 ++++--
 gcc/rust/hir/rust-ast-lower-type.h             |   2 +-
 gcc/rust/parse/rust-parse-impl.h               |  83 ++++++------
 gcc/rust/parse/rust-parse.h                    |   2 +-
 gcc/rust/resolve/rust-ast-resolve-type.cc      |  47 ++++++-
 gcc/testsuite/rust/compile/const_generics_2.rs |   1 +
 9 files changed, 253 insertions(+), 163 deletions(-)


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-07 11:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-07 11:35 [gcc/devel/rust/master] Merge #1355 Thomas Schwinge

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).