From patchwork Wed Feb 7 11:43:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1896138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=Q8CejH7V; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TVKln1cvwz23gT for ; Wed, 7 Feb 2024 23:52:53 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 25BEA38582A9 for ; Wed, 7 Feb 2024 12:52:51 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id DC42438582BD for ; Wed, 7 Feb 2024 12:44:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC42438582BD Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DC42438582BD Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::332 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309858; cv=none; b=ZLQmVCXgcH2N2mhSP6xXoMdI1jg8YRtcowIvZPJNtI57XshYG3sLB4HzceTn9jEaWGQ8fsfV/OsedVJ9Fu2Uz62Br7gkF9DBCMriZPRBILCi4Q9jXsK1Po4avhRWjrjn0LaTwPOEVKnBykXlIjRIYhJblkktEusqmUfpdzgS94Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309858; c=relaxed/simple; bh=7eCtILJT7fZqPi1Gkx6A5/5xgZNNJfJ5rDiHF9vbf0M=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=XprnC7GImom45hbZ6goF1Z7Aczm67Fq+w6MZ0V49+0mGtkEiQRDBp0wX8fdIBJBNefCprx7M44mJkcC9riBbxjGW71YNHB4SzBl3UK3rvBGt/skDVZi9hBcIr/BBaN3PTXJrkJgm/XznOdDv1cgUe6XEaUJYppbLCHLOITsuEc4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-410219f18f9so504675e9.1 for ; Wed, 07 Feb 2024 04:44:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1707309847; x=1707914647; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=HguN8gt8Hn8MrSs8ctd0Pp8v5/mXUgPlaoVv7GT9Cpg=; b=Q8CejH7VCZsviRzodBqnFPfLI4F+ktky5F5hBh8f6JIZmcxHJo0JbnSY1CRBrmGdyk LO2z9HRw+zbXaSXJZ/EwWiKGAgnKfnUE0T/Bq+wcl6mSJN7sx8I6Riq7uxFRRDkvmM/7 UIZym9X9b3kxShpeEXFhi15eCmyAFYcF3KUMFF3bi2Q6pUlBQ3xbKPrUwNMNGLVEuZnu yM0bA+FCnohb0EsKLE0hYnED/52/qGcOgGXilNg6StS6oP3Uscvreu25rKiA3fUd+bRI vSMwxatbxbQtKX0h6DdYVpviv8KuSA65JJtgXTxDARKO9hU66+Gq8lf76Tl9wP5vovQk 20uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707309847; x=1707914647; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HguN8gt8Hn8MrSs8ctd0Pp8v5/mXUgPlaoVv7GT9Cpg=; b=QKIHmz6Cs9haS6EsvDt8fCIul3Ce9dfUcIyNgPtIavLq220XL/OIYgRp6LtsRKH3j3 zM06cKFcaiJByNPbDTps/3zeqbxn5WYzxBHL8l0TWTeanSj+5fvSF3VY6YCWC+Uhc0/S 1jr/8Jh0sqhownaSVk9uSUokKI27wJtoB28R78iN1zhd7ld9hVH9tDSHvabC0gU1+jT7 KycFjFSHgaUit/6zSq+WERbh9A+1OFcFPLDd8NMESADN52FaggJImNj0s6p0sa+KXyIa br0+7OyZVSWTlK3Wg1EOymGU2Zv6KZVpwS8lqnOZX2B57rOuaaFuNABAX44UEHM3DkTN Nd9g== X-Gm-Message-State: AOJu0YxMZa966iRD4bk58nyi2K3SIa4j984Ul1MKMWZcV6MwKdxSKlf3 XnQQ32GdvZcirYnMUZT781jkX/lV7MOwRzIvzP1+VV0ik24JIrcpN7TCHZGb1U3CirZeb0caCrm XrQ== X-Google-Smtp-Source: AGHT+IFlVF+oBHjSjQLM2s5cKbJKfVMDwQFUVHQZJlnkvgzS6LAU837zQTJ+5AhbXi8T/fR0OGCA1Q== X-Received: by 2002:a05:600c:4fc1:b0:410:ae8:4c2d with SMTP id o1-20020a05600c4fc100b004100ae84c2dmr1462981wmq.3.1707309847449; Wed, 07 Feb 2024 04:44:07 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWirX5Wndw0FSdTaCBPpVOG/koBOdfsBL1z3XTRXAJGCNPeGDQ21cm1G5hPbI4NFmT7+Ee5t8OqbgHWzcm9t6b9gHU= Received: from platypus.sou.embecosm-corp.com ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id x19-20020a05600c2a5300b0040fbdd6f69bsm5044188wme.33.2024.02.07.04.44.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 04:44:06 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Jakub Dupak Subject: [COMMITTED 08/25] gccrs: TyTy: Store reference to type before any substitutions Date: Wed, 7 Feb 2024 12:43:54 +0100 Message-ID: <20240207114419.1100894-9-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240207114419.1100894-2-arthur.cohen@embecosm.com> References: <20240207114419.1100894-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Jakub Dupak gcc/rust/ChangeLog: * typecheck/rust-tyty.cc (BaseType::BaseType): Store orig ref. (BaseType::get_orig_ref): Add getter. * typecheck/rust-tyty.h: Store orig ref. Signed-off-by: Jakub Dupak --- gcc/rust/typecheck/rust-tyty.cc | 10 ++++++++-- gcc/rust/typecheck/rust-tyty.h | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc index a8d358161fc..d81311eed6e 100644 --- a/gcc/rust/typecheck/rust-tyty.cc +++ b/gcc/rust/typecheck/rust-tyty.cc @@ -140,14 +140,15 @@ is_primitive_type_kind (TypeKind kind) BaseType::BaseType (HirId ref, HirId ty_ref, TypeKind kind, RustIdent ident, std::set refs) : TypeBoundsMappings ({}), kind (kind), ref (ref), ty_ref (ty_ref), - combined (refs), ident (ident), mappings (Analysis::Mappings::get ()) + orig_ref (ref), combined (refs), ident (ident), + mappings (Analysis::Mappings::get ()) {} BaseType::BaseType (HirId ref, HirId ty_ref, TypeKind kind, RustIdent ident, std::vector specified_bounds, std::set refs) : TypeBoundsMappings (specified_bounds), kind (kind), ref (ref), - ty_ref (ty_ref), combined (refs), ident (ident), + ty_ref (ty_ref), orig_ref (ref), combined (refs), ident (ident), mappings (Analysis::Mappings::get ()) {} @@ -178,6 +179,11 @@ BaseType::set_ty_ref (HirId id) { ty_ref = id; } +HirId +BaseType::get_orig_ref () const +{ + return orig_ref; +} bool BaseType::is_equal (const BaseType &other) const diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h index 570a57bff01..5d4eab42a91 100644 --- a/gcc/rust/typecheck/rust-tyty.h +++ b/gcc/rust/typecheck/rust-tyty.h @@ -99,6 +99,8 @@ public: HirId get_ty_ref () const; void set_ty_ref (HirId id); + HirId get_orig_ref () const; + virtual void accept_vis (TyVisitor &vis) = 0; virtual void accept_vis (TyConstVisitor &vis) const = 0; @@ -243,6 +245,7 @@ protected: TypeKind kind; HirId ref; HirId ty_ref; + const HirId orig_ref; std::set combined; RustIdent ident;