re PR c++/12495 (ICE in cp/typeck.c:907)

PR c++/12495
	* pt.c (lookup_template_class): Handle when current_class_type
	is a local class.

	* g++.dg/template/crash21.C: New test.

From-SVN: r72643
This commit is contained in:
Kriang Lerdsuwanakij 2003-10-18 17:35:47 +00:00 committed by Kriang Lerdsuwanakij
parent 3a198a72d2
commit 5f04800c28
4 changed files with 33 additions and 8 deletions

View File

@ -1,3 +1,9 @@
2003-10-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/12495
* pt.c (lookup_template_class): Handle when current_class_type
is a local class.
2003-10-17 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/2513

View File

@ -4163,14 +4163,12 @@ lookup_template_class (tree d1,
tree ctx;
for (ctx = current_class_type;
ctx;
ctx = TYPE_CONTEXT (ctx))
{
if (TREE_CODE (ctx) == NAMESPACE_DECL)
break;
if (same_type_p (ctx, template_type))
goto found_ctx;
}
ctx && TREE_CODE (ctx) != NAMESPACE_DECL;
ctx = (TYPE_P (ctx)
? TYPE_CONTEXT (ctx)
: DECL_CONTEXT (ctx)))
if (TYPE_P (ctx) && same_type_p (ctx, template_type))
goto found_ctx;
/* We're not in the scope of the class, so the
TEMPLATE_TYPE is not the type we want after all. */

View File

@ -1,3 +1,8 @@
2003-10-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/12495
* g++.dg/template/crash21.C: New test.
2003-10-17 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/2513

View File

@ -0,0 +1,16 @@
// { dg-do compile }
// Origin: rmerkert@alphatech.com
// Volker Reichelt <reichelt@gcc.gnu.org>
// PR c++/12495: ICE looking up class template in local class.
template <typename> struct A {};
template <typename T> void foo()
{
struct B
{
B (const A<T>&);
};
}