From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5472 invoked by alias); 30 Sep 2011 20:42:01 -0000 Received: (qmail 5461 invoked by uid 22791); 30 Sep 2011 20:42:00 -0000 X-SWARE-Spam-Status: No, hits=-6.7 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 30 Sep 2011 20:41:42 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8UKfHWQ012707 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 30 Sep 2011 16:41:17 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8UKfF1f023357; Fri, 30 Sep 2011 16:41:15 -0400 Received: from [0.0.0.0] (ovpn-113-113.phx2.redhat.com [10.3.113.113]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p8UKfB6j012504; Fri, 30 Sep 2011 16:41:11 -0400 Message-ID: <4E862966.6080801@redhat.com> Date: Fri, 30 Sep 2011 21:04:00 -0000 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:6.0.2) Gecko/20110906 Thunderbird/6.0.2 MIME-Version: 1.0 To: Dodji Seketeli CC: gcc-patches@gcc.gnu.org, tromey@redhat.com, gdr@integrable-solutions.net, joseph@codesourcery.com, burnus@net-b.de, charlet@act-europe.fr, bonzini@gnu.org Subject: Re: [PATCH 3/7] Emit macro expansion related diagnostics References: <1291979498-1604-1-git-send-email-dodji@redhat.com> <7ab852c58faea9efd81130c5a1ddc9e78b34bcc5.1310824121.git.dodji@redhat.com> <4E6E73F8.4030603@redhat.com> <4E74AA75.8090106@redhat.com> <4E778A26.1000707@redhat.com> <4E77ACA1.80205@redhat.com> <4E789C5B.20509@redhat.com> <4E793BF4.4010103@redhat.com> <4E7B497F.8060301@redhat.com> <4E80E47C.305@redhat.com> <4E83B6D5.5030907@redhat.com> <4E84C9FA.30604@redhat.com> <4E85E004.2030706@redhat.com> In-Reply-To: <4E85E004.2030706@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2011-09/txt/msg02086.txt.bz2 On 09/30/2011 11:28 AM, Jason Merrill wrote: > +linemap_location_before_p (struct line_maps *set, > + source_location pre, > + source_location post) > +{ > + bool pre_from_macro_p, post_from_macro_p; > + > + if (pre == post) > + return false; > + > + pre_from_macro_p = > + linemap_location_from_macro_expansion_p (set, pre); > + post_from_macro_p = > + linemap_location_from_macro_expansion_p (set, post); > + > + if (pre_from_macro_p != post_from_macro_p) > + { > + if (pre_from_macro_p) > + pre = linemap_macro_loc_to_exp_point (set, pre, NULL); > + else > + post = linemap_macro_loc_to_exp_point (set, post, NULL); > + } What if the two locations are from different macros? Jason