From ccfbd8805b8207ae6377e362f59e774144c8f367 Mon Sep 17 00:00:00 2001
From: Richard Guenther <rguenther@suse.de>
Date: Tue, 24 Feb 2009 14:50:30 +0000
Subject: [PATCH] re PR c++/39242 (Inconsistent reject / accept of code)

2009-02-24  Richard Guenther  <rguenther@suse.de>

	PR c++/39242
	* pt.c (instantiate_decl): Do not instantiate extern, non-inline
	declared functions.

	* g++.dg/template/instantiate10.C: New testcase.

From-SVN: r144408
---
 gcc/cp/ChangeLog                              |  6 +++
 gcc/cp/pt.c                                   |  9 ++++-
 gcc/testsuite/ChangeLog                       |  5 +++
 gcc/testsuite/g++.dg/template/instantiate10.C | 37 +++++++++++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/template/instantiate10.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0af13722a56..139abc656e0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-24  Richard Guenther  <rguenther@suse.de>
+
+	PR c++/39242
+	* pt.c (instantiate_decl): Do not instantiate extern, non-inline
+	declared functions.
+
 2009-02-23  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR c++/36411
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index bef6002c4ff..dacc8689f38 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -15295,9 +15295,14 @@ instantiate_decl (tree d, int defer_ok,
   /* In general, we do not instantiate such templates...  */
   if (external_p
       /* ... but we instantiate inline functions so that we can inline
-	 them and ... */
+	 them.  An explicit instantiation declaration prohibits implicit
+	 instantiation of non-inline functions.  With high levels of
+	 optimization, we would normally inline non-inline functions
+	 -- but we're not allowed to do that for "extern template" functions.
+	 Therefore, we check DECL_DECLARED_INLINE_P, rather than
+	 possibly_inlined_p.  And ...  */
       && ! (TREE_CODE (d) == FUNCTION_DECL
-	    && possibly_inlined_p (d))
+	    && DECL_DECLARED_INLINE_P (d))
       /* ... we instantiate static data members whose values are
 	 needed in integral constant expressions.  */
       && ! (TREE_CODE (d) == VAR_DECL
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4af6e184362..00a2ce9acaa 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-24  Richard Guenther  <rguenther@suse.de>
+
+	PR c++/39242
+	* g++.dg/template/instantiate10.C: New testcase.
+
 2009-02-24  Richard Guenther  <rguenther@suse.de>
 	Zdenek Dvorak  <ook@ucw.cz>
 
diff --git a/gcc/testsuite/g++.dg/template/instantiate10.C b/gcc/testsuite/g++.dg/template/instantiate10.C
new file mode 100644
index 00000000000..678e0194ae8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/instantiate10.C
@@ -0,0 +1,37 @@
+/* PR c++/39242, xplicit instantiation declaration prohibits implicit
+   instantiation of non-inline functions.  */
+/* { dg-do compile } */
+/* { dg-options "-O" } */
+
+class Rep {
+public:
+    void unref() const { }
+    static void unref (const Rep * obj_r) { obj_r->unref(); }
+};
+template<typename _Tp, typename _Bt = _Tp>
+class RepPtrStore {
+    _Tp * _obj;
+    void _assign( _Tp * new_r );
+public:
+    ~RepPtrStore() { _assign( 0 ); }
+};
+template<typename _Tp,typename _Bt>
+void RepPtrStore<_Tp,_Bt>::_assign( _Tp * new_r )
+{
+  Rep::unref( _obj );
+}
+class RepPtrBase { };
+template<typename _Bt> class PtrBase : public RepPtrBase { };
+template<typename _Tp, typename _Bt = _Tp>
+class Ptr : public PtrBase<_Bt> {
+    RepPtrStore<_Tp,_Bt> _ptr;
+};
+class YCode;
+class YStatement;
+typedef Ptr<YStatement,YCode> YStatementPtr;
+extern template class RepPtrStore<YStatement,YCode>;
+class ExecutionEnvironment {
+    YStatementPtr m_statement;
+    ~ExecutionEnvironment() { };
+};
+
-- 
2.30.2