diff options
| author | DJ Delorie <dj@cygnus.com> | 1998-12-18 11:50:30 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-12-18 06:50:30 -0500 |
| commit | 09ad2917045b93a3576f7adcf2e09ee9b17f9c6f (patch) | |
| tree | 59d3b840cf0abf15f75598d3c58f9ee83ceb0665 /gcc | |
| parent | bbcec105382edc476901620cfff1e47f9b9c3e76 (diff) | |
| download | gcc-09ad2917045b93a3576f7adcf2e09ee9b17f9c6f.zip gcc-09ad2917045b93a3576f7adcf2e09ee9b17f9c6f.tar.gz gcc-09ad2917045b93a3576f7adcf2e09ee9b17f9c6f.tar.bz2 | |
cvt.c (convert_to_reference): Check for both error_mark_node and NULL_NODE after call to...
* cvt.c (convert_to_reference): Check for both error_mark_node
and NULL_NODE after call to convert_for_initialization.
From-SVN: r24373
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 86901b8..ca7bc01 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +1998-12-18 DJ Delorie <dj@cygnus.com> + + * cvt.c (convert_to_reference): Check for both error_mark_node + and NULL_NODE after call to convert_for_initialization. + 1998-12-17 Jason Merrill <jason@yorick.cygnus.com> * error.c (interesting_scope_p): New fn. diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index c8f9fcc..b643ddc 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -506,8 +506,8 @@ convert_to_reference (reftype, expr, convtype, flags, decl) { rval = convert_for_initialization (NULL_TREE, type, expr, flags, "converting", 0, 0); - if (rval == error_mark_node) - return error_mark_node; + if (rval == NULL_TREE || rval == error_mark_node) + return rval; rval = build_up_reference (reftype, rval, flags); if (rval && ! CP_TYPE_CONST_P (TREE_TYPE (reftype))) |