OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/23947 (segv in reshape_init_r()) 

PR c++/23947
	* rtti.c (get_pseudo_ti_init): Recompute ti pointer after
	get_tinfo_ptr calls.

	* g++.dg/rtti/crash3.C: New test.

From-SVN: r104456
This commit is contained in:
Jakub Jelinek 2005-09-20 17:40:57 +02:00 committed by Jakub Jelinek
parent 18c57f2c94
commit 96d84476fa
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2005-09-20 Jakub Jelinek <jakub@redhat.com>
PR c++/23947
* rtti.c (get_pseudo_ti_init): Recompute ti pointer after
get_tinfo_ptr calls.
2005-09-16 Mark Mitchell <mark@codesourcery.com>
PR c++/23914

7
gcc/cp/rtti.c
View File

@ -1020,7 +1020,9 @@ get_pseudo_ti_init (tree type, unsigned tk_index)
tree base_binfo = BINFO_BASE_BINFO (TYPE_BINFO (type), 0);
tree tinfo = get_tinfo_ptr (BINFO_TYPE (base_binfo));
tree base_inits = tree_cons (NULL_TREE, tinfo, NULL_TREE);
/* get_tinfo_ptr might have reallocated the tinfo_descs vector. */
ti = VEC_index (tinfo_s, tinfo_descs, tk_index);
return class_initializer (ti, type, base_inits);
}
@ -1079,6 +1081,9 @@ get_pseudo_ti_init (tree type, unsigned tk_index)
base_inits = tree_cons (NULL_TREE,
build_int_cst (NULL_TREE, hint),
base_inits);
/* get_tinfo_ptr might have reallocated the tinfo_descs vector. */
ti = VEC_index (tinfo_s, tinfo_descs, tk_index);
return class_initializer (ti, type, base_inits);
}
}

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2005-09-20 Jakub Jelinek <jakub@redhat.com>
PR c++/23947
* g++.dg/rtti/crash3.C: New test.
PR tree-optimization/23818
* gcc.dg/pr23818.c: New test.

10
gcc/testsuite/g++.dg/rtti/crash3.C Normal file
View File

@ -0,0 +1,10 @@
// PR c++/23947
// { dg-do compile }
class A {};
class B {};
class C : public A, public B {};
class D : public C {};
void f () throw (D)
{
}