From 0ac69b47fbd5c46b29f27ce9ab10ff63498ceeee Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 28 Jun 2008 00:26:48 +0200 Subject: [PATCH] re PR c++/36364 (Problem with -frepo) PR c++/36364 * repo.c (repo_emit_p): Put const static data members initialized by const expr into *.rpo file, just return 2 if IDENTIFIER_REPO_CHOSEN for it is 0. * g++.dg/template/repo9.C: New test. From-SVN: r137205 --- gcc/cp/ChangeLog | 7 ++++ gcc/cp/repo.c | 9 +++-- gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/g++.dg/template/repo9.C | 48 +++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/repo9.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e2368b462ce..14d08aca504 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2008-06-28 Jakub Jelinek + + PR c++/36364 + * repo.c (repo_emit_p): Put const static data members initialized + by const expr into *.rpo file, just return 2 if IDENTIFIER_REPO_CHOSEN + for it is 0. + 2008-06-27 Paolo Carlini PR c++/36655 diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c index 1fe96a2ddde..b53062dfe8f 100644 --- a/gcc/cp/repo.c +++ b/gcc/cp/repo.c @@ -280,6 +280,7 @@ finish_repo (void) int repo_emit_p (tree decl) { + int ret = 0; gcc_assert (TREE_PUBLIC (decl)); gcc_assert (TREE_CODE (decl) == FUNCTION_DECL || TREE_CODE (decl) == VAR_DECL); @@ -306,10 +307,12 @@ repo_emit_p (tree decl) return 2; /* Const static data members initialized by constant expressions must be processed where needed so that their definitions are - available. */ + available. Still record them into *.rpo files, so if they + weren't actually emitted and collect2 requests them, they can + be provided. */ if (DECL_INTEGRAL_CONSTANT_VAR_P (decl) && DECL_CLASS_SCOPE_P (decl)) - return 2; + ret = 2; } else if (!DECL_TEMPLATE_INSTANTIATION (decl)) return 2; @@ -343,7 +346,7 @@ repo_emit_p (tree decl) pending_repo = tree_cons (NULL_TREE, decl, pending_repo); } - return IDENTIFIER_REPO_CHOSEN (DECL_ASSEMBLER_NAME (decl)); + return IDENTIFIER_REPO_CHOSEN (DECL_ASSEMBLER_NAME (decl)) ? 1 : ret; } /* Returns true iff the prelinker has explicitly marked CLASS_TYPE for diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6d739ff152b..d0d635d3357 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-06-28 Jakub Jelinek + + PR c++/36364 + * g++.dg/template/repo9.C: New test. + 2008-06-27 Paolo Carlini PR c++/36655 diff --git a/gcc/testsuite/g++.dg/template/repo9.C b/gcc/testsuite/g++.dg/template/repo9.C new file mode 100644 index 00000000000..f55024cb001 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/repo9.C @@ -0,0 +1,48 @@ +// PR c++/36364 +// { dg-options "-frepo" } +// { dg-final { cleanup-repo-files } } +// { dg-require-host-local "" } + +template struct A +{ + static void assign (C &c1, const C &c2) { c1 = c2; } +}; + +template struct B +{ + struct D + { + static const C terminal; + static unsigned long stor[]; + static D &empty_rep () + { + void *p = reinterpret_cast (&stor); + return *reinterpret_cast (p); + } + void test (unsigned long n) + { + T::assign (this->refdata ()[n], terminal); + } + C *refdata () throw () + { + return reinterpret_cast (this + 1); + } + }; + C *dataplus; + C *data () const { return dataplus; } + D *rep () const { return &((reinterpret_cast < D * >(data ()))[-1]); } + static D & empty_rep () { return D::empty_rep (); } + B () : dataplus (empty_rep ().refdata ()) { } + ~B () { } + void push_back (C c) { rep ()->test (10); } +}; + +template const C B ::D::terminal = C (); +template unsigned long B ::D::stor[64]; + +int +main () +{ + B > s; + s.push_back ('a'); +} -- 2.30.2