From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id 281373857835 for ; Wed, 6 Sep 2023 13:49:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 281373857835 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-x42c.google.com with SMTP id ffacd0b85a97d-31dd10c2b8bso3085125f8f.3 for ; Wed, 06 Sep 2023 06:49:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1694008182; x=1694612982; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hetkGrmeDG13oiHR8aZXsOSfVZui3rbu8np43OAk7+E=; b=PBxRcs9OTzDcW1KkRrip0ExFVLzQJGdzVQw1SGXULo+jBxgEDYJaBPojOtAwQH8WCV z9HuQnGykY/DGYlXhf6lxZFb0fhCVqavQunABwkDeVQ6H24XP2uCgDnNPHM4dMP3BkD8 EYXfl6as55RD4vx8BJttRwLRsyejiWPv9mLC20UZSI0IisU0Bb/HBZ0XlJ8+3tWjjbj7 dtx3hLzaE/sWTl1SY6mr+c2FANUv8KHfn3VHkCLNc5xDA0SuqjpjqhlyuCSdXEHchUs2 1WVKYHJfXqiKFwkXEt2kiS5+ci1S/czo/uNB2L1DU8nZo4coSgRhk9Bn6r/6JOX5tUpg sW1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694008182; x=1694612982; h=content-transfer-encoding:mime-version: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=hetkGrmeDG13oiHR8aZXsOSfVZui3rbu8np43OAk7+E=; b=hxPk/+OU98lW5ZzkevcMKW5HdqMqZwpDFo/TnT8MZEWPJnRRfhWZzqnJBgCdPJFQs9 a5YzLf7ikw4KTzxkI8iYnwc2ttz8+x8rVMs30zmS2skPNJnl82i1rmDXQzPcOwf/yaC3 v604UctEA+1cWxMSCkmlExWPUctAaKZ/9rKM3I8i5uJ95dDn9yoWLaYYwMII0Sne28tj Q8+YXFlt6Mpf5FrD10Cz02K5/lAKehb8Kwg8i5Bsk0nvG0gCzEKsYm7nsGhu67Cyzhmk jozuKFtzHVhy+UoMPiwVondIX14rW2/uYWAYfWlRnhlK5yChx5gWCf06Fo5XdLf0BRKb DBlA== X-Gm-Message-State: AOJu0YwYnViUYt6NNhO2/IEpJ3VYS1fTX6xBmfnitPXIJ5sdNbyadxL5 ept2eTuVTDR9Jxxn9C53uOxlCsNdbI2rmO77nCEw9a4= X-Google-Smtp-Source: AGHT+IFB16xp5T99TOzMNn2kr/HCGrXLe/w1ZZzlU93N7xsjhdlMQQJGCa6Mc6bRDrMxRDj4SLgMPA== X-Received: by 2002:adf:e80b:0:b0:319:6ec3:79c7 with SMTP id o11-20020adfe80b000000b003196ec379c7mr2211950wrm.36.1694008181819; Wed, 06 Sep 2023 06:49:41 -0700 (PDT) Received: from localhost.localdomain ([2001:861:5e4c:3bb0:fa3:84b9:61c0:bf1a]) by smtp.gmail.com with ESMTPSA id k8-20020a5d4288000000b003176aa612b1sm20528505wrq.38.2023.09.06.06.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 06:49:41 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, dmalcolm@redhat.com Subject: [PATCH 2/2] Experiment with adding an error code to an error Date: Wed, 6 Sep 2023 15:53:03 +0200 Message-Id: <20230906135303.3643659-3-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230906135303.3643659-1-arthur.cohen@embecosm.com> References: <20230906135303.3643659-1-arthur.cohen@embecosm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.0 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: David Malcolm --- gcc/rust/rust-diagnostics.cc | 11 +++++++ gcc/rust/rust-diagnostics.h | 18 ++++++++++ gcc/rust/rust-gcc-diagnostics.cc | 33 +++++++++++++++++++ gcc/rust/typecheck/rust-casts.cc | 2 +- .../rust/compile/bad_as_bool_char.rs | 4 +-- 5 files changed, 65 insertions(+), 3 deletions(-) diff --git a/gcc/rust/rust-diagnostics.cc b/gcc/rust/rust-diagnostics.cc index 4e5c2ececd4..f29aec67652 100644 --- a/gcc/rust/rust-diagnostics.cc +++ b/gcc/rust/rust-diagnostics.cc @@ -166,6 +166,17 @@ rust_error_at (const Location location, const char *fmt, ...) va_end (ap); } +void +rust_error_at (const RichLocation &location, const ErrorCode code, + const char *fmt, ...) +{ + va_list ap; + + va_start (ap, fmt); + rust_be_error_at (location, code, expand_message (fmt, ap)); + va_end (ap); +} + void rust_warning_at (const Location location, int opt, const char *fmt, ...) { diff --git a/gcc/rust/rust-diagnostics.h b/gcc/rust/rust-diagnostics.h index 43fee8baf4f..d198bd5736f 100644 --- a/gcc/rust/rust-diagnostics.h +++ b/gcc/rust/rust-diagnostics.h @@ -50,6 +50,18 @@ // clang-format off // simple location + +struct ErrorCode +{ + explicit ErrorCode (const char *str) : m_str (str) + { + gcc_assert (str); + gcc_assert (str[0] == 'E'); + } + + const char *m_str; +}; + extern void rust_internal_error_at (const Location, const char *fmt, ...) RUST_ATTRIBUTE_GCC_DIAG (2, 3) @@ -72,6 +84,9 @@ rust_inform (const Location, const char *fmt, ...) extern void rust_error_at (const RichLocation &, const char *fmt, ...) RUST_ATTRIBUTE_GCC_DIAG (2, 3); +extern void +rust_error_at (const RichLocation &, const ErrorCode, const char *fmt, ...) + RUST_ATTRIBUTE_GCC_DIAG (3, 4); // clang-format on // These interfaces provide a way for the front end to ask for @@ -97,6 +112,9 @@ rust_be_error_at (const Location, const std::string &errmsg); extern void rust_be_error_at (const RichLocation &, const std::string &errmsg); extern void +rust_be_error_at (const RichLocation &, const ErrorCode, + const std::string &errmsg); +extern void rust_be_warning_at (const Location, int opt, const std::string &warningmsg); extern void rust_be_fatal_error (const Location, const std::string &errmsg) diff --git a/gcc/rust/rust-gcc-diagnostics.cc b/gcc/rust/rust-gcc-diagnostics.cc index 72d2c068541..58c0a5654ea 100644 --- a/gcc/rust/rust-gcc-diagnostics.cc +++ b/gcc/rust/rust-gcc-diagnostics.cc @@ -22,6 +22,7 @@ #include "rust-diagnostics.h" #include "options.h" +#include "diagnostic-metadata.h" void rust_be_internal_error_at (const Location location, const std::string &errmsg) @@ -70,6 +71,38 @@ rust_be_error_at (const RichLocation &location, const std::string &errmsg) error_at (&gcc_loc, "%s", errmsg.c_str ()); } +class rust_error_code_rule : public diagnostic_metadata::rule +{ +public: + rust_error_code_rule (const ErrorCode code) : m_code (code) {} + + char *make_description () const final override + { + return xstrdup (m_code.m_str); + } + + char *make_url () const final override + { + return concat ("https://doc.rust-lang.org/error-index.html#", m_code.m_str, + NULL); + } + +private: + const ErrorCode m_code; +}; + +void +rust_be_error_at (const RichLocation &location, const ErrorCode code, + const std::string &errmsg) +{ + /* TODO: 'error_at' would like a non-'const' 'rich_location *'. */ + rich_location &gcc_loc = const_cast (location.get ()); + diagnostic_metadata m; + rust_error_code_rule rule (code); + m.add_rule (rule); + error_meta (&gcc_loc, m, "%s", errmsg.c_str ()); +} + void rust_be_get_quotechars (const char **open_qu, const char **close_qu) { diff --git a/gcc/rust/typecheck/rust-casts.cc b/gcc/rust/typecheck/rust-casts.cc index e379216b948..987542e59c4 100644 --- a/gcc/rust/typecheck/rust-casts.cc +++ b/gcc/rust/typecheck/rust-casts.cc @@ -283,7 +283,7 @@ TypeCastRules::emit_cast_error () const RichLocation r (locus); r.add_range (from.get_locus ()); r.add_range (to.get_locus ()); - rust_error_at (r, "invalid cast %<%s%> to %<%s%>", + rust_error_at (r, ErrorCode ("E0054"), "invalid cast %<%s%> to %<%s%>", from.get_ty ()->get_name ().c_str (), to.get_ty ()->get_name ().c_str ()); } diff --git a/gcc/testsuite/rust/compile/bad_as_bool_char.rs b/gcc/testsuite/rust/compile/bad_as_bool_char.rs index 91a28eebe00..9652915fe11 100644 --- a/gcc/testsuite/rust/compile/bad_as_bool_char.rs +++ b/gcc/testsuite/rust/compile/bad_as_bool_char.rs @@ -5,13 +5,13 @@ pub fn main () let fone = t as f32; // { dg-error "invalid cast" } let fzero = f as f64; // { dg-error "invalid cast" } - let nb = 0u8 as bool; // { dg-error "invalid cast" } + let nb = 0u8 as bool; // { dg-error "invalid cast .u8. to .bool. \\\[E0054\\\]" } let nc = true as char; // { dg-error "invalid cast" } let a = 'a'; let b = 'b'; let fa = a as f32; // { dg-error "invalid cast" } - let bb = b as bool; // { dg-error "invalid cast" } + let bb = b as bool; // { dg-error "invalid cast .char. to .bool. \\\[E0054\\\]" } let t32: u32 = 33; let ab = t32 as char; // { dg-error "invalid cast" } -- 2.40.0