diff options
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/explicit-instantiation2.C | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 1f64f747ca6..926b26d5c55 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -9974,6 +9974,9 @@ mark_decl_instantiated (result, extern_p) set correctly by tsubst. */ TREE_PUBLIC (result) = 1; + /* This might have been set by an earlier implicit instantiation. */ + DECL_COMDAT (result) = 0; + if (! extern_p) { DECL_INTERFACE_KNOWN (result) = 1; diff --git a/gcc/testsuite/g++.dg/template/explicit-instantiation2.C b/gcc/testsuite/g++.dg/template/explicit-instantiation2.C new file mode 100644 index 00000000000..21109a765aa --- /dev/null +++ b/gcc/testsuite/g++.dg/template/explicit-instantiation2.C @@ -0,0 +1,6 @@ +// Bug 10968: implicit instantiation overrides explicit instantiation +// { dg-final { scan-assembler "_Z1fIiET_S0_" } } + +template <class T> T f (T t) { return t; } +inline void g () { f (4); } +template int f (int); |
