procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

friend.c (add_friend): Deal gracefully with error_mark_node.

Browse source 
* friend.c (add_friend): Deal gracefully with error_mark_node.
	* method.c (build_overload_value): Handle pointers-to-members as
	template parameters.

From-SVN: r26351
This commit is contained in:
Mark Mitchell 1999-04-11 18:48:27 +00:00 • committed by Mark Mitchell
parent 391cdef056
commit 82bed8708b
4 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/cp/ChangeLog
View file

@ -1,5 +1,9 @@
1999-04-11 Mark Mitchell <mark@codesourcery.com>
* friend.c (add_friend): Deal gracefully with error_mark_node.
* method.c (build_overload_value): Handle pointers-to-members as
template parameters.
* decl.c (push_binding): Fix typo in comment.
1999-04-10 Mark Mitchell <mark@codesourcery.com>

12
gcc/cp/friend.c
View file

@ -141,10 +141,16 @@ void
add_friend (type, decl)
tree type, decl;
{
tree typedecl = TYPE_MAIN_DECL (type);
tree list = DECL_FRIENDLIST (typedecl);
tree name = DECL_NAME (decl);
tree typedecl;
tree list;
tree name;
if (decl == error_mark_node)
return;
typedecl = TYPE_MAIN_DECL (type);
list = DECL_FRIENDLIST (typedecl);
name = DECL_NAME (decl);
type = TREE_TYPE (typedecl);
while (list)

16
gcc/cp/method.c
View file

@ -858,6 +858,22 @@ build_overload_value (type, value, in_template)
tree delta2;
my_friendly_assert (TYPE_PTRMEMFUNC_P (type), 0);
/* We'll get a ADDR_EXPR of a SCOPE_REF here if we're
mangling, an instantiation of something like:
template <class T, void (T::*fp)()> class C {};
template <class T> C<T, &T::f> x();
We mangle the return type of the function, and that
contains template parameters. */
if (TREE_CODE (value) == ADDR_EXPR
&& TREE_CODE (TREE_OPERAND (value, 0)) == SCOPE_REF)
{
build_overload_scope_ref (TREE_OPERAND (value, 0));
break;
}
my_friendly_assert (TREE_CODE (value) == PTRMEM_CST, 0);
expand_ptrmemfunc_cst (value, &delta, &idx, &pfn, &delta2);

22
gcc/testsuite/g++.old-deja/g++.pt/crash37.C Normal file
View file

@ -0,0 +1,22 @@
// Build don't link:
// Origin: Jens Maurer <jmaurer@menuett.rhein-main.de>
template<class T, void (T::*f)(int)>
class C { };
template<class T>
C<T, &T::output> call(T& obj)
{ return C<T, &T::output>();
}
class Test {
public:
void output(int);
};
void sub()
{
Test t;
call(t);
}