re PR c++/17163 (ICE with -frepo and static class variables)

PR c++/17163
	* pt.c (instantiate_decl): Do not try to apply
	DECL_DECLARED_INLINED_P to a VAR_DECL.

	PR c++/17163
	* g++.dg/template/repo2.C: New test.

From-SVN: r86467
This commit is contained in:
Mark Mitchell 2004-08-24 06:37:58 +00:00 committed by Mark Mitchell
parent a2fe197507
commit c2a124b2b4
5 changed files with 31 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2004-08-23 Mark Mitchell <mark@codesourcery.com>
PR c++/17163
* pt.c (instantiate_decl): Do not try to apply
DECL_DECLARED_INLINED_P to a VAR_DECL.
* search.c (build_baselink): Fix typo in comment.
2004-08-22 Andrew Pinski <apinski@apple.com>
Revert:

View File

@ -11183,7 +11183,9 @@ instantiate_decl (tree d, int defer_ok, int undefined_ok)
/* Instantiate inline functions so that the inliner can do its
job, even though we'll not be emitting a copy of this
function. */
if (!flag_inline_trees || !DECL_DECLARED_INLINE_P (d))
if (!(TREE_CODE (d) == FUNCTION_DECL
&& flag_inline_trees
&& DECL_DECLARED_INLINE_P (d)))
goto out;
}

View File

@ -1135,7 +1135,7 @@ lookup_field_r (tree binfo, void *data)
return NULL_TREE;
}
/* Return a "baselink" which BASELINK_BINFO, BASELINK_ACCESS_BINFO,
/* Return a "baselink" with BASELINK_BINFO, BASELINK_ACCESS_BINFO,
BASELINK_FUNCTIONS, and BASELINK_OPTYPE set to BINFO, ACCESS_BINFO,
FUNCTIONS, and OPTYPE respectively. */

View File

@ -1,3 +1,8 @@
2004-08-23 Mark Mitchell <mark@codesourcery.com>
PR c++/17163
* g++.dg/template/repo2.C: New test.
2004-08-23 Roger Sayle <roger@eyesopen.com>
PR rtl-optimization/17078

View File

@ -0,0 +1,14 @@
// PR c++/17163
// { dg-options "-frepo" }
template <int __inst>
struct __Atomicity_lock
{
static unsigned char _S_atomicity_lock;
};
template <int __inst>
unsigned char __Atomicity_lock<__inst>::_S_atomicity_lock = 0;
template unsigned char __Atomicity_lock<0>::_S_atomicity_lock;
int main () {
}