From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 8B3863858C1F for ; Thu, 15 Jun 2023 00:28:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8B3863858C1F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686788909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nK+A7on4KThmKi+2UPkcryjNcUIFxcl3lN2fdyQsIfg=; b=BWodTRGA3/E7ktp5Ri0LDgqXcx3uneBFmPZFITWcIga6WJUI7RN4emnttfjnsYnO+UZHtQ bgAeeBf+52qacYx1IOp6ld29jQPdXAiQhu0dFk9MnQBd/FxpkZ8iv5bKSZ/tKu0jpNp4G2 ScyiWsaM/tFekFA6m1lmaCSM6+coPO8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-263-EhY4ySNePpKkt6TNsuMgoA-1; Wed, 14 Jun 2023 20:28:16 -0400 X-MC-Unique: EhY4ySNePpKkt6TNsuMgoA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6DBD28028B2 for ; Thu, 15 Jun 2023 00:28:16 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.8.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44CA41121315; Thu, 15 Jun 2023 00:28:16 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH] c++: provide #include hint for missing includes [PR110164] Date: Wed, 14 Jun 2023 20:28:14 -0400 Message-Id: <20230615002814.967814-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: PR c++/110164 notes that in cases where we have a forward decl of a std library type such as: std::array x; we omit this diagnostic: error: aggregate ‘std::array x’ has incomplete type and cannot be defined This patch adds this hint to the diagnostic: note: ‘std::array’ is defined in header ‘’; this is probably fixable by adding ‘#include ’ Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. OK for trunk? gcc/cp/ChangeLog: PR c++/110164 * cp-name-hint.h (maybe_suggest_missing_header): New decl. * decl.cc: Define INCLUDE_MEMORY. Add include of "cp/cp-name-hint.h". (start_decl_1): Call maybe_suggest_missing_header. * name-lookup.cc (maybe_suggest_missing_header): Remove "static". gcc/testsuite/ChangeLog: PR c++/110164 * g++.dg/missing-header-pr110164.C: New test. --- gcc/cp/cp-name-hint.h | 3 +++ gcc/cp/decl.cc | 10 ++++++++++ gcc/cp/name-lookup.cc | 2 +- gcc/testsuite/g++.dg/missing-header-pr110164.C | 10 ++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/missing-header-pr110164.C diff --git a/gcc/cp/cp-name-hint.h b/gcc/cp/cp-name-hint.h index bfa7c53c8f6..e2387e23d1f 100644 --- a/gcc/cp/cp-name-hint.h +++ b/gcc/cp/cp-name-hint.h @@ -32,6 +32,9 @@ along with GCC; see the file COPYING3. If not see extern name_hint suggest_alternatives_for (location_t, tree, bool); extern name_hint suggest_alternatives_in_other_namespaces (location_t, tree); +extern name_hint maybe_suggest_missing_header (location_t location, + tree name, + tree scope); extern name_hint suggest_alternative_in_explicit_scope (location_t, tree, tree); extern name_hint suggest_alternative_in_scoped_enum (tree, tree); diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index a672e4844f1..504b08ec250 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see line numbers. For example, the CONST_DECLs for enum values. */ #include "config.h" +#define INCLUDE_MEMORY #include "system.h" #include "coretypes.h" #include "target.h" @@ -46,6 +47,7 @@ along with GCC; see the file COPYING3. If not see #include "c-family/c-objc.h" #include "c-family/c-pragma.h" #include "c-family/c-ubsan.h" +#include "cp/cp-name-hint.h" #include "debug.h" #include "plugin.h" #include "builtins.h" @@ -5995,7 +5997,11 @@ start_decl_1 (tree decl, bool initialized) ; /* An auto type is ok. */ else if (TREE_CODE (type) != ARRAY_TYPE) { + auto_diagnostic_group d; error ("variable %q#D has initializer but incomplete type", decl); + maybe_suggest_missing_header (input_location, + TYPE_IDENTIFIER (type), + TYPE_CONTEXT (type)); type = TREE_TYPE (decl) = error_mark_node; } else if (!COMPLETE_TYPE_P (complete_type (TREE_TYPE (type)))) @@ -6011,8 +6017,12 @@ start_decl_1 (tree decl, bool initialized) gcc_assert (CLASS_PLACEHOLDER_TEMPLATE (type)); else { + auto_diagnostic_group d; error ("aggregate %q#D has incomplete type and cannot be defined", decl); + maybe_suggest_missing_header (input_location, + TYPE_IDENTIFIER (type), + TYPE_CONTEXT (type)); /* Change the type so that assemble_variable will give DECL an rtl we can live with: (mem (const_int 0)). */ type = TREE_TYPE (decl) = error_mark_node; diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc index 6ac58a35b56..917b481c163 100644 --- a/gcc/cp/name-lookup.cc +++ b/gcc/cp/name-lookup.cc @@ -6796,7 +6796,7 @@ maybe_suggest_missing_std_header (location_t location, tree name) for NAME within SCOPE at LOCATION, or an empty name_hint if this isn't applicable. */ -static name_hint +name_hint maybe_suggest_missing_header (location_t location, tree name, tree scope) { if (scope == NULL_TREE) diff --git a/gcc/testsuite/g++.dg/missing-header-pr110164.C b/gcc/testsuite/g++.dg/missing-header-pr110164.C new file mode 100644 index 00000000000..15980071c38 --- /dev/null +++ b/gcc/testsuite/g++.dg/missing-header-pr110164.C @@ -0,0 +1,10 @@ +// { dg-require-effective-target c++11 } + +#include + +std::array a1; /* { dg-error "incomplete type" } */ +/* { dg-message "'std::array' is defined in header ''; this is probably fixable by adding '#include '" "hint" { target *-*-* } .-1 } */ + +std::array a2 {5}; /* { dg-error "incomplete type" } */ +/* { dg-message "'std::array' is defined in header ''; this is probably fixable by adding '#include '" "hint" { target *-*-* } .-1 } */ + -- 2.26.3