From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id 300AD384DD30 for ; Tue, 21 Feb 2023 12:03:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 300AD384DD30 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x42e.google.com with SMTP id l25so3756944wrb.3 for ; Tue, 21 Feb 2023 04:03:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; 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=bdJtvjW+kVPvmSQZ+NCJb+ySr4zY4gBrlQB15L7NmAc=; b=BW1/hPs1Rg4+UZbyq1biI3KIh64L89nLH5f1E5SbMGbPnWg1a+PpSFIIB1vygTONrs W2Gkq+gjJCN1pW388AG0Zk0NH/+BhVfVBBZFHd/H6q8DcZfm9tA2qjLRWsuEO12gRMy5 R4S57Q7SYM6TZlEtiQHXTtA1u1jBOPp6dzZpU381eEGQ4ifSAmHd8xB+7i/2WXWucJq5 xqcbSKZGuqOZSz5iDZ9Z5U/K5+XIDRHck4BY+YFWNQjFWBS4WhJkisw0eDOz+iTuNMMM ftnrOZFeMUDhfjGMQVHGNNe4jXWI4VpTe7Ljs0R5gAQdvSSla8q5wlaDLvN/0uffHcEq AFcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=bdJtvjW+kVPvmSQZ+NCJb+ySr4zY4gBrlQB15L7NmAc=; b=rn0IKri/e8w5VaCHSNNAHe49Z3fGc4l3LJAS+2CO/L/rDYP3nfGAEyhqHseiEdkNOl VaCdN7KrCPtlOmNnKD4a7PD5piBC3BjKuwudYCEf7+2DWDCAmL91m5P6VUTzmUagGLE+ nXY8D54OVeMJUqe/mPr4XJe9lyYwWxpX8PvOTcIA+QFVPIA66fZPmdPZLjnalTpm3lpf w5KovfzV99aHRwWOZ21/Xu7QfkEWe33TqrB54FkwaIJhIO7IWtW2Rt6HhhJ0cTAjsx8Z DNRYAqSs69/yYF6muX9bIPV7bqNzBCbiqrny4oZZ0S38zSu2S75VzrNQsmoIWJD1MN5p mBJg== X-Gm-Message-State: AO0yUKV1RLDQYkiN7tMcp4G2i46b7RXAZgj2FJJXf2t9kw6kT7RlHzhz TNkNcUNV9urUBTyaxbNbyNcA X-Google-Smtp-Source: AK7set//eSW+8lPvwMq6e0cmKxIdYTzXQtmQb5nEAHfBrwhnX04tuQtZo6Gx9qWBjDNupHWEzOERVg== X-Received: by 2002:a5d:4712:0:b0:2c5:4c6f:27c6 with SMTP id y18-20020a5d4712000000b002c54c6f27c6mr3925758wrq.5.1676981012759; Tue, 21 Feb 2023 04:03:32 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id c15-20020adffb4f000000b002c55b0e6ef1sm5013811wrs.4.2023.02.21.04.03.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 04:03:32 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [committed 011/103] gccrs: Support looking up super traits for trait items Date: Tue, 21 Feb 2023 13:01:01 +0100 Message-Id: <20230221120230.596966-12-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221120230.596966-1-arthur.cohen@embecosm.com> References: <20230221120230.596966-1-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Philip Herron When supporting calls to super traits we need to allow lookups based on the super traits as specified on the TraitReferences. Fixes #1555 gcc/rust/ChangeLog: * typecheck/rust-hir-trait-ref.h (lookup_trait_item): Add lookup in super_trait. gcc/testsuite/ChangeLog: * rust/compile/torture/issue-1555.rs: New test. --- gcc/rust/typecheck/rust-hir-trait-ref.h | 19 ++++++++ .../rust/compile/torture/issue-1555.rs | 48 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 gcc/testsuite/rust/compile/torture/issue-1555.rs diff --git a/gcc/rust/typecheck/rust-hir-trait-ref.h b/gcc/rust/typecheck/rust-hir-trait-ref.h index f6a3328c5f6..7eeb3300387 100644 --- a/gcc/rust/typecheck/rust-hir-trait-ref.h +++ b/gcc/rust/typecheck/rust-hir-trait-ref.h @@ -336,6 +336,15 @@ public: return true; } } + + // lookup super traits + for (const auto &super_trait : super_traits) + { + bool found = super_trait->lookup_trait_item (ident, ref); + if (found) + return true; + } + return false; } @@ -351,6 +360,16 @@ public: if (ident.compare (item.get_identifier ()) == 0) return &item; } + + // lookup super traits + for (const auto &super_trait : super_traits) + { + const TraitItemReference *res + = super_trait->lookup_trait_item (ident, type); + if (!res->is_error ()) + return res; + } + return &TraitItemReference::error_node (); } diff --git a/gcc/testsuite/rust/compile/torture/issue-1555.rs b/gcc/testsuite/rust/compile/torture/issue-1555.rs new file mode 100644 index 00000000000..adb48911648 --- /dev/null +++ b/gcc/testsuite/rust/compile/torture/issue-1555.rs @@ -0,0 +1,48 @@ +extern "C" { + fn printf(s: *const i8, ...); +} + +struct Foo(i32); +trait Bar { + fn baz(&self); +} + +trait Baz: Bar { + fn qux(&self); +} + +impl Bar for Foo { + fn baz(&self) { + unsafe { + let a = "baz %i\n\0"; + let b = a as *const str; + let c = b as *const i8; + + printf(c, self.0); + } + } +} + +impl Baz for Foo { + fn qux(&self) { + unsafe { + let a = "qux %i\n\0"; + let b = a as *const str; + let c = b as *const i8; + + printf(c, self.0); + } + } +} + +fn static_dispatch(t: &T) { + t.baz(); + t.qux(); +} + +pub fn main() { + let a; + a = &Foo(123); + + static_dispatch(a); +} -- 2.39.1