This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [C++ Patch] PR 30500
- From: Paolo Carlini <pcarlini at suse dot de>
- To: Mark Mitchell <mark at codesourcery dot com>
- Cc: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Mon, 26 Mar 2007 12:45:46 +0200
- Subject: Re: [C++ Patch] PR 30500
- References: <46072A6E.7020505@suse.de> <4607310B.3010705@codesourcery.com>
Mark Mitchell wrote:
OK for mainline, as long as you check that in_system_header is restored
upon pop_from_top_level.
I see, thanks. Therefore, later today, when testing finishes, I'm going
to commit the below variant, which uses the usual strategy to that effect.
Paolo.
/////////////
2007-03-26 Paolo Carlini <pcarlini@suse.de>
PR c++/30500
* pt.c (instantiate_decl): Set in_system_header.
2007-03-26 Paolo Carlini <pcarlini@suse.de>
PR c++/30500
* g++.dg/warn/pragma-system_header1.C: New test.
* g++.dg/warn/pragma-system_header1.h. New.
Index: gcc/testsuite/g++.dg/warn/pragma-system_header1.C
===================================================================
--- gcc/testsuite/g++.dg/warn/pragma-system_header1.C (revision 0)
+++ gcc/testsuite/g++.dg/warn/pragma-system_header1.C (revision 0)
@@ -0,0 +1,10 @@
+// PR c++/30500
+// { dg-options "-Wconversion" }
+
+#include "pragma-system_header1.h"
+
+void f()
+{
+ g<int>();
+ h<int>();
+}
Index: gcc/testsuite/g++.dg/warn/pragma-system_header1.h
===================================================================
--- gcc/testsuite/g++.dg/warn/pragma-system_header1.h (revision 0)
+++ gcc/testsuite/g++.dg/warn/pragma-system_header1.h (revision 0)
@@ -0,0 +1,7 @@
+#pragma GCC system_header
+
+template <typename T>
+ int g() { double d = 0.0; return d; }
+
+template <typename T>
+ T h() { double d = 0.0; return d; }
Index: gcc/cp/pt.c
===================================================================
--- gcc/cp/pt.c (revision 123204)
+++ gcc/cp/pt.c (working copy)
@@ -13829,6 +13829,7 @@
bool pattern_defined;
int need_push;
location_t saved_loc = input_location;
+ int saved_in_system_header = in_system_header;
bool external_p;
/* This function should only be used to instantiate templates for
@@ -13911,6 +13912,7 @@
mark_definable (d);
input_location = DECL_SOURCE_LOCATION (d);
+ in_system_header = DECL_IN_SYSTEM_HEADER (d);
/* If D is a member of an explicitly instantiated class template,
and no definition is available, treat it like an implicit
@@ -14178,6 +14180,7 @@
out:
input_location = saved_loc;
+ in_system_header = saved_in_system_header;
pop_deferring_access_checks ();
pop_tinst_level ();