mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-29 17:05:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

cvt.c (cp_convert_to_pointer): Handle NULL pointer conversions, even in complex virtual base class hierarchies.

Browse Source 
* cvt.c (cp_convert_to_pointer): Handle NULL pointer
	conversions, even in complex virtual base class hierarchies.

From-SVN: r21626
This commit is contained in:
Mark Mitchell 1998-08-07 09:56:06 +00:00 committed by Mark Mitchell
parent bd106708cf
commit 523633872a
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
1998-08-07 Mark Mitchell <mark@markmitchell.com>
* cvt.c (cp_convert_to_pointer): Handle a NULL pointer
conversions, even in complex virtual base class hierarchies.
1998-08-06 Mark Mitchell <mark@markmitchell.com> 1998-08-06 Mark Mitchell <mark@markmitchell.com>
* cp-tree.h (ENUM_TEMPLATE_INFO): New macro. * cp-tree.h (ENUM_TEMPLATE_INFO): New macro.

10
gcc/cp/cvt.c
View File

@ -154,7 +154,15 @@ cp_convert_to_pointer (type, expr)
&& TREE_CODE (TREE_TYPE (type)) == RECORD_TYPE && TREE_CODE (TREE_TYPE (type)) == RECORD_TYPE
&& IS_AGGR_TYPE (TREE_TYPE (type)) && IS_AGGR_TYPE (TREE_TYPE (type))
&& IS_AGGR_TYPE (TREE_TYPE (intype)) && IS_AGGR_TYPE (TREE_TYPE (intype))
&& TREE_CODE (TREE_TYPE (intype)) == RECORD_TYPE) && TREE_CODE (TREE_TYPE (intype)) == RECORD_TYPE
/* If EXPR is NULL, then we don't need to do any arithmetic
to convert it:
[conv.ptr]
The null pointer value is converted to the null pointer
value of the destination type. */
&& !integer_zerop (expr))
{ {
enum tree_code code = PLUS_EXPR; enum tree_code code = PLUS_EXPR;
tree binfo = get_binfo (TREE_TYPE (type), TREE_TYPE (intype), 1); tree binfo = get_binfo (TREE_TYPE (type), TREE_TYPE (intype), 1);

16
gcc/testsuite/g++.old-deja/g++.other/cast1.C Normal file
View File

@ -0,0 +1,16 @@
// Build don't link:
struct S0 { };
struct S1 : virtual public S0 { };
struct S2 : virtual public S0 { };
struct S3 : public S1, public S2, virtual public S0
{
};
void f(const S0*) {}
void g()
{
f(static_cast<S3*>(0));
}