From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26653 invoked by alias); 1 Jul 2011 07:30:23 -0000 Received: (qmail 26643 invoked by uid 22791); 1 Jul 2011 07:30:21 -0000 X-SWARE-Spam-Status: No, hits=-6.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_BJ,TW_JC,T_RP_MATCHES_RCVD 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, 01 Jul 2011 07:30:03 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p617U2T0030439 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 1 Jul 2011 03:30:02 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [10.16.42.4]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p617U1NH020085 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 1 Jul 2011 03:30:01 -0400 Received: from tyan-ft48-01.lab.bos.redhat.com (localhost.localdomain [127.0.0.1]) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4) with ESMTP id p617U00p025083; Fri, 1 Jul 2011 09:30:00 +0200 Received: (from jakub@localhost) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4/Submit) id p617U0C3025081; Fri, 1 Jul 2011 09:30:00 +0200 Date: Fri, 01 Jul 2011 07:30:00 -0000 From: Jakub Jelinek To: Jason Merrill Cc: gcc-patches List Subject: Re: C++ PATCH to avoid duplicate overload resolution (related to c++/48481) Message-ID: <20110701073000.GD16443@tyan-ft48-01.lab.bos.redhat.com> Reply-To: Jakub Jelinek References: <4E0CE5E1.1060900@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4E0CE5E1.1060900@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes 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-07/txt/msg00008.txt.bz2 On Thu, Jun 30, 2011 at 05:08:49PM -0400, Jason Merrill wrote: > Author: Jason Merrill > Date: Thu Jun 30 00:03:40 2011 -0400 > > PR c++/48481 > * name-lookup.c (struct arg_lookup): Add fn_set. > (add_function): Check it. > (lookup_arg_dependent_1): Initialize it. > > diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c > index 8bf5f5f..615e177 100644 > --- a/gcc/cp/name-lookup.c > +++ b/gcc/cp/name-lookup.c > @@ -33,6 +33,7 @@ along with GCC; see the file COPYING3. If not see > #include "debug.h" > #include "c-family/c-pragma.h" > #include "params.h" > +#include "pointer-set.h" Then cp/name-lookup.o should depend on pointer-set.h in cp/Make-lang.in. Fixed thusly, so far untested, I've noticed a couple of other spots. Ok for trunk after testing? OT, if we don't switch to on the fly dependency generation, I think it would be nice to at least a write a maintainer-script that would regenerate GCC style rules for dependences in Makefile.in and */Make-lang.in - dependencies on just immediately mentioned headers, and for headers with dependencies find a matching SPLAY_TREE_H etc. variable, which we could run once a month or so to make sure our Makefiles are up to date. 2011-07-01 Jakub Jelinek * Make-lang.in (cp/decl.o): Depend on pointer-set.h. (cp/class.o): Likewise. (cp/error.o): Likewise. (cp/name-lookup.o): Likewise. (cp/decl2.o): Likewise. Don't depend on $(POINTER_SET_H). --- gcc/cp/Make-lang.in.jj 2011-06-17 11:01:54.000000000 +0200 +++ gcc/cp/Make-lang.in 2011-07-01 09:19:29.000000000 +0200 @@ -266,11 +266,11 @@ cp/decl.o: cp/decl.c $(CXX_TREE_H) $(TM_ output.h toplev.h $(HASHTAB_H) $(RTL_H) \ cp/operators.def $(TM_P_H) $(TREE_INLINE_H) $(DIAGNOSTIC_H) $(C_PRAGMA_H) \ debug.h gt-cp-decl.h $(TIMEVAR_H) $(TARGET_H) $(PLUGIN_H) \ - intl.h tree-iterator.h $(SPLAY_TREE_H) \ + intl.h tree-iterator.h pointer-set.h $(SPLAY_TREE_H) \ c-family/c-objc.h cp/decl2.o: cp/decl2.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) cp/decl.h \ output.h toplev.h $(C_COMMON_H) gt-cp-decl2.h $(CGRAPH_H) \ - $(C_PRAGMA_H) $(TREE_DUMP_H) intl.h $(TARGET_H) $(GIMPLE_H) $(POINTER_SET_H) \ + $(C_PRAGMA_H) $(TREE_DUMP_H) intl.h $(TARGET_H) $(GIMPLE_H) pointer-set.h \ $(SPLAY_TREE_H) c-family/c-ada-spec.h \ c-family/c-objc.h cp/cp-objcp-common.o : cp/cp-objcp-common.c $(CONFIG_H) $(SYSTEM_H) \ @@ -284,7 +284,7 @@ cp/typeck.o: cp/typeck.c $(CXX_TREE_H) $ output.h c-family/c-objc.h cp/class.o: cp/class.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h \ $(TARGET_H) convert.h $(CGRAPH_H) $(TREE_DUMP_H) gt-cp-class.h \ - $(SPLAY_TREE_H) + $(SPLAY_TREE_H) pointer-set.h cp/call.o: cp/call.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h \ $(DIAGNOSTIC_CORE_H) intl.h gt-cp-call.h convert.h $(TARGET_H) langhooks.h \ $(TIMEVAR_H) c-family/c-objc.h @@ -312,7 +312,7 @@ cp/pt.o: cp/pt.c $(CXX_TREE_H) $(TM_H) c c-family/c-objc.h cp/error.o: cp/error.c $(CXX_TREE_H) $(TM_H) $(DIAGNOSTIC_H) \ $(FLAGS_H) $(REAL_H) $(LANGHOOKS_DEF_H) $(CXX_PRETTY_PRINT_H) \ - tree-diagnostic.h tree-pretty-print.h c-family/c-objc.h + tree-diagnostic.h tree-pretty-print.h pointer-set.h c-family/c-objc.h cp/repo.o: cp/repo.c $(CXX_TREE_H) $(TM_H) toplev.h $(DIAGNOSTIC_CORE_H) \ gt-cp-repo.h cp/semantics.o: cp/semantics.c $(CXX_TREE_H) $(TM_H) toplev.h \ @@ -333,7 +333,7 @@ cp/cp-gimplify.o: cp/cp-gimplify.c $(CXX cp/name-lookup.o: cp/name-lookup.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(CXX_TREE_H) $(TIMEVAR_H) gt-cp-name-lookup.h \ - $(DIAGNOSTIC_CORE_H) $(FLAGS_H) debug.h + $(DIAGNOSTIC_CORE_H) $(FLAGS_H) debug.h pointer-set.h cp/cxx-pretty-print.o: cp/cxx-pretty-print.c $(CXX_PRETTY_PRINT_H) \ $(CONFIG_H) $(SYSTEM_H) $(TM_H) coretypes.h $(CXX_TREE_H) tree-pretty-print.h Jakub