From patchwork Mon Oct 17 13:32:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 120205 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 51899B6F9C for ; Tue, 18 Oct 2011 00:34:48 +1100 (EST) Received: (qmail 27098 invoked by alias); 17 Oct 2011 13:34:45 -0000 Received: (qmail 26534 invoked by uid 22791); 17 Oct 2011 13:34:43 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rcsinet15.oracle.com (HELO rcsinet15.oracle.com) (148.87.113.117) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 17 Oct 2011 13:34:29 +0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by rcsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id p9HDYQTc009111 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 17 Oct 2011 13:34:28 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id p9HDQQS2012746 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 17 Oct 2011 13:26:26 GMT Received: from abhmt113.oracle.com (abhmt113.oracle.com [141.146.116.65]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id p9HDYK0R031130; Mon, 17 Oct 2011 08:34:20 -0500 Received: from [192.168.1.4] (/79.56.212.85) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 17 Oct 2011 06:34:20 -0700 Message-ID: <4E9C2E61.80109@oracle.com> Date: Mon, 17 Oct 2011 15:32:17 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: Jason Merrill Subject: [C++ Patch] PR 44524 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi, here submitter requests a more accurate error message for X.Y where X is a pointer to class type. Thus the below, tested x86_64-linux. Ok for mainline? Thanks, Paolo. ////////////////////////// /cp 2011-10-17 Paolo Carlini PR c++/44524 * typeck.c (build_class_member_access_expr): Provide a better error message for X.Y where X is a pointer to class type. (finish_class_member_access_expr): Likewise. /testsuite 2011-10-17 Paolo Carlini PR c++/44524 * g++.dg/parse/error41.C: New. * g++.dg/parse/error20.C: Adjust. Index: testsuite/g++.dg/parse/error20.C =================================================================== --- testsuite/g++.dg/parse/error20.C (revision 180087) +++ testsuite/g++.dg/parse/error20.C (working copy) @@ -12,7 +12,7 @@ struct C { }; int main() { C c; - A(c.p.i); // { dg-error "9:request for member 'i' in 'c.C::p', which is of non-class type 'B" } + A(c.p.i); // { dg-error "9:request for member 'i' in 'c.C::p', which has pointer type 'B" } return 0; } Index: testsuite/g++.dg/parse/error41.C =================================================================== --- testsuite/g++.dg/parse/error41.C (revision 0) +++ testsuite/g++.dg/parse/error41.C (revision 0) @@ -0,0 +1,11 @@ +// PR c++/44524 + +template +struct map +{ + bool empty(); +}; + +int bar(map *X) { + return X.empty(); // { dg-error "which has pointer type 'map" } +} Index: cp/typeck.c =================================================================== --- cp/typeck.c (revision 180087) +++ cp/typeck.c (working copy) @@ -2128,8 +2128,16 @@ build_class_member_access_expr (tree object, tree if (!CLASS_TYPE_P (object_type)) { if (complain & tf_error) - error ("request for member %qD in %qE, which is of non-class type %qT", - member, object, object_type); + { + if (POINTER_TYPE_P (object_type) + && CLASS_TYPE_P (TREE_TYPE (object_type))) + error ("request for member %qD in %qE, which has pointer " + "type %qT (maybe you meant to use %<->%> ?)", + member, object, object_type); + else + error ("request for member %qD in %qE, which is of non-class " + "type %qT", member, object, object_type); + } return error_mark_node; } @@ -2508,8 +2516,16 @@ finish_class_member_access_expr (tree object, tree if (!CLASS_TYPE_P (object_type)) { if (complain & tf_error) - error ("request for member %qD in %qE, which is of non-class type %qT", - name, object, object_type); + { + if (POINTER_TYPE_P (object_type) + && CLASS_TYPE_P (TREE_TYPE (object_type))) + error ("request for member %qD in %qE, which has pointer " + "type %qT (maybe you meant to use %<->%> ?)", + name, object, object_type); + else + error ("request for member %qD in %qE, which is of non-class " + "type %qT", name, object, object_type); + } return error_mark_node; }