From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 7B3413895FC5; Wed, 8 Jun 2022 12:44:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B3413895FC5 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Destructure our generics, placeholers or projections during coercion X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 74e836599ce80a11b1fe28065ed7aae6ffa3b7e2 X-Git-Newrev: 55346cc59b766266202a0ba2114275eb2fc53dda Message-Id: <20220608124454.7B3413895FC5@sourceware.org> Date: Wed, 8 Jun 2022 12:44:54 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 12:44:54 -0000 https://gcc.gnu.org/g:55346cc59b766266202a0ba2114275eb2fc53dda commit 55346cc59b766266202a0ba2114275eb2fc53dda Author: Philip Herron Date: Fri May 6 12:46:13 2022 +0100 Destructure our generics, placeholers or projections during coercion When we coerce types we need to destructure from the generics in order to apply these coercion rules correctly or we end up returning a bad error_mark_node. Diff: --- gcc/rust/backend/rust-compile-base.h | 4 ++-- gcc/rust/backend/rust-compile.cc | 25 ++++++++++++++++--------- gcc/rust/typecheck/rust-tyty.cc | 32 ++++++++++++++++++++++++++++++++ gcc/rust/typecheck/rust-tyty.h | 5 +++++ 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/gcc/rust/backend/rust-compile-base.h b/gcc/rust/backend/rust-compile-base.h index 77e6cc34b9f..52e0568c88e 100644 --- a/gcc/rust/backend/rust-compile-base.h +++ b/gcc/rust/backend/rust-compile-base.h @@ -40,8 +40,8 @@ protected: protected: Context *get_context () { return ctx; } - tree coercion_site (tree rvalue, TyTy::BaseType *actual, - TyTy::BaseType *expected, Location lvalue_locus, + tree coercion_site (tree rvalue, const TyTy::BaseType *actual, + const TyTy::BaseType *expected, Location lvalue_locus, Location rvalue_locus); tree coerce_to_dyn_object (tree compiled_ref, const TyTy::BaseType *actual, diff --git a/gcc/rust/backend/rust-compile.cc b/gcc/rust/backend/rust-compile.cc index 49155d22640..d9349d5a07b 100644 --- a/gcc/rust/backend/rust-compile.cc +++ b/gcc/rust/backend/rust-compile.cc @@ -198,21 +198,26 @@ CompileStructExprField::visit (HIR::StructExprFieldIdentifier &field) // Shared methods in compilation tree -HIRCompileBase::coercion_site (tree rvalue, TyTy::BaseType *actual, - TyTy::BaseType *expected, Location lvalue_locus, - Location rvalue_locus) +HIRCompileBase::coercion_site (tree rvalue, const TyTy::BaseType *rval, + const TyTy::BaseType *lval, + Location lvalue_locus, Location rvalue_locus) { if (rvalue == error_mark_node) return error_mark_node; + const TyTy::BaseType *actual = rval->destructure (); + const TyTy::BaseType *expected = lval->destructure (); + if (expected->get_kind () == TyTy::TypeKind::REF) { // bad coercion... of something to a reference if (actual->get_kind () != TyTy::TypeKind::REF) return error_mark_node; - TyTy::ReferenceType *exp = static_cast (expected); - TyTy::ReferenceType *act = static_cast (actual); + const TyTy::ReferenceType *exp + = static_cast (expected); + const TyTy::ReferenceType *act + = static_cast (actual); tree expected_type = TyTyResolveCompile::compile (ctx, act->get_base ()); tree deref_rvalue @@ -235,20 +240,22 @@ HIRCompileBase::coercion_site (tree rvalue, TyTy::BaseType *actual, if (!valid_coercion) return error_mark_node; - TyTy::ReferenceType *exp = static_cast (expected); + const TyTy::ReferenceType *exp + = static_cast (expected); TyTy::BaseType *actual_base = nullptr; tree expected_type = error_mark_node; if (actual->get_kind () == TyTy::TypeKind::REF) { - TyTy::ReferenceType *act - = static_cast (actual); + const TyTy::ReferenceType *act + = static_cast (actual); actual_base = act->get_base (); expected_type = TyTyResolveCompile::compile (ctx, act->get_base ()); } else if (actual->get_kind () == TyTy::TypeKind::POINTER) { - TyTy::PointerType *act = static_cast (actual); + const TyTy::PointerType *act + = static_cast (actual); actual_base = act->get_base (); expected_type = TyTyResolveCompile::compile (ctx, act->get_base ()); } diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc index fcbf9986d7d..09f5e4c5a36 100644 --- a/gcc/rust/typecheck/rust-tyty.cc +++ b/gcc/rust/typecheck/rust-tyty.cc @@ -229,6 +229,38 @@ BaseType::get_root () const return root; } +const BaseType * +BaseType::destructure () const +{ + switch (get_kind ()) + { + case TyTy::TypeKind::PARAM: { + const TyTy::ParamType *p = static_cast (this); + return p->resolve (); + } + break; + + case TyTy::TypeKind::PLACEHOLDER: { + const TyTy::PlaceholderType *p + = static_cast (this); + rust_assert (p->can_resolve ()); + return p->resolve (); + } + break; + + case TyTy::TypeKind::PROJECTION: { + const TyTy::ProjectionType *p + = static_cast (this); + return p->get (); + } + + default: + return this; + } + + return this; +} + TyVar::TyVar (HirId ref) : ref (ref) { // ensure this reference is defined within the context diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h index b00237c1c27..8517b725ea2 100644 --- a/gcc/rust/typecheck/rust-tyty.h +++ b/gcc/rust/typecheck/rust-tyty.h @@ -253,8 +253,13 @@ public: debug_str ().c_str ()); } + // FIXME this will eventually go away const BaseType *get_root () const; + // This will get the monomorphized type from Params, Placeholders or + // Projections if available or error + const BaseType *destructure () const; + const RustIdent &get_ident () const { return ident; } Location get_locus () const { return ident.locus; }