From 912291cac35a25eb09234e087d12c4890e1d809c Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 26 Mar 2007 21:55:03 +0000 Subject: [PATCH] re PR c++/30500 (pragma GCC system_header vs templates) 2007-03-26 Paolo Carlini PR c++/30500 * pt.c (instantiate_decl): Set in_system_header. 2007-03-26 Paolo Carlini PR c++/30500 * g++.dg/warn/pragma-system_header1.C: New test. * g++.dg/warn/pragma-system_header2.C: New test. * g++.dg/warn/pragma-system_header1.h. New. * g++.dg/warn/pragma-system_header2.h. New. From-SVN: r123238 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 3 +++ gcc/testsuite/g++.dg/warn/pragma-system_header1.C | 10 ++++++++++ gcc/testsuite/g++.dg/warn/pragma-system_header1.h | 7 +++++++ gcc/testsuite/g++.dg/warn/pragma-system_header2.C | 13 +++++++++++++ gcc/testsuite/g++.dg/warn/pragma-system_header2.h | 5 +++++ 6 files changed, 43 insertions(+) create mode 100644 gcc/testsuite/g++.dg/warn/pragma-system_header1.C create mode 100644 gcc/testsuite/g++.dg/warn/pragma-system_header1.h create mode 100644 gcc/testsuite/g++.dg/warn/pragma-system_header2.C create mode 100644 gcc/testsuite/g++.dg/warn/pragma-system_header2.h diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 42a57d035ac..98758dd85a2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2007-03-26 Paolo Carlini + + PR c++/30500 + * pt.c (instantiate_decl): Set in_system_header. + 2007-03-22 Mark Mitchell * cp-tree.h (current_tempalte_parms): Improve documentation. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 69c60b4f5af..da3cd23a944 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13829,6 +13829,7 @@ instantiate_decl (tree d, int defer_ok, 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 @@ instantiate_decl (tree d, int defer_ok, 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 @@ instantiate_decl (tree d, int defer_ok, out: input_location = saved_loc; + in_system_header = saved_in_system_header; pop_deferring_access_checks (); pop_tinst_level (); diff --git a/gcc/testsuite/g++.dg/warn/pragma-system_header1.C b/gcc/testsuite/g++.dg/warn/pragma-system_header1.C new file mode 100644 index 00000000000..489761b5b2f --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pragma-system_header1.C @@ -0,0 +1,10 @@ +// PR c++/30500 +// { dg-options "-Wconversion" } + +#include "pragma-system_header1.h" + +void f() +{ + g(); + h(); +} diff --git a/gcc/testsuite/g++.dg/warn/pragma-system_header1.h b/gcc/testsuite/g++.dg/warn/pragma-system_header1.h new file mode 100644 index 00000000000..684c6bf12ba --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pragma-system_header1.h @@ -0,0 +1,7 @@ +#pragma GCC system_header + +template + int g() { double d = 0.1; return d; } + +template + T h() { double d = 0.1; return d; } diff --git a/gcc/testsuite/g++.dg/warn/pragma-system_header2.C b/gcc/testsuite/g++.dg/warn/pragma-system_header2.C new file mode 100644 index 00000000000..be29474084a --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pragma-system_header2.C @@ -0,0 +1,13 @@ +// PR c++/30500 +// { dg-options "-Wconversion" } + +#include "pragma-system_header2.h" + +void f() +{ + g(); + h(); +} + +// { dg-warning "conversion" "" { target *-*-* } 2 } +// { dg-warning "conversion" "" { target *-*-* } 5 } diff --git a/gcc/testsuite/g++.dg/warn/pragma-system_header2.h b/gcc/testsuite/g++.dg/warn/pragma-system_header2.h new file mode 100644 index 00000000000..aa4f0e94d4c --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/pragma-system_header2.h @@ -0,0 +1,5 @@ +template + int g() { double d = 0.1; return d; } + +template + T h() { double d = 0.1; return d; }