diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2024-11-19 15:37:56 +0100 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2024-11-20 13:36:42 +0000 |
| commit | cd37d69a6347882723f6aa1d373995ac3bcb1378 (patch) | |
| tree | 6d657cd241877ae67361b730ca31e900273594a4 | |
| parent | d424b0b467901e05bf17c2d168f1701ec81b7c08 (diff) | |
| download | gcc-cd37d69a6347882723f6aa1d373995ac3bcb1378.zip gcc-cd37d69a6347882723f6aa1d373995ac3bcb1378.tar.gz gcc-cd37d69a6347882723f6aa1d373995ac3bcb1378.tar.bz2 | |
FnParam cloning now keeps projections
FnParam type where monomorphized during cloning.
gcc/rust/ChangeLog:
* typecheck/rust-tyty.h: Reverse monomorphization during cloning and
make a new function to explicitly monomorphize.
* typecheck/rust-tyty.cc: Use monomorphization when required.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
| -rw-r--r-- | gcc/rust/typecheck/rust-tyty.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/typecheck/rust-tyty.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc index 26c0612..467bf1c 100644 --- a/gcc/rust/typecheck/rust-tyty.cc +++ b/gcc/rust/typecheck/rust-tyty.cc @@ -597,7 +597,7 @@ BaseType::monomorphized_clone () const { std::vector<TyTy::FnParam> cloned_params; for (auto &p : fn->get_params ()) - cloned_params.push_back (p.clone ()); + cloned_params.push_back (p.monomorphized_clone ()); BaseType *retty = fn->get_return_type ()->monomorphized_clone (); return new FnType (fn->get_ref (), fn->get_ty_ref (), fn->get_id (), diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h index c896d1e..167d425 100644 --- a/gcc/rust/typecheck/rust-tyty.h +++ b/gcc/rust/typecheck/rust-tyty.h @@ -792,6 +792,11 @@ public: FnParam clone () const { + return FnParam (pattern->clone_pattern (), type->clone ()); + } + + FnParam monomorphized_clone () const + { return FnParam (pattern->clone_pattern (), type->monomorphized_clone ()); } |