* cvt.c (convert_to_reference): Check for both error_mark_node

	and NULL_NODE after call to convert_for_initialization.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24373 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 86901b8..ca7bc01 100644 (file)
--- 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 (file)
--- 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)))