diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-27 22:26:48 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-27 22:26:48 +0000 |
| commit | 7133f4fc27ee85d8eab2b827df227149432acca4 (patch) | |
| tree | 551a1cfdede2d1e29abc740a3fdd9deccda535fd /gcc/cp/repo.c | |
| parent | 22b869b1397f01e442a474f667df0fb841be1276 (diff) | |
| download | gcc-7133f4fc27ee85d8eab2b827df227149432acca4.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137205 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/repo.c')
| -rw-r--r-- | gcc/cp/repo.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 |