From: Andrew Pinski <pinskia@physics.uc.edu>
Date: Thu, 23 Sep 2004 20:04:21 +0000 (+0000)
Subject: 004-09-23  Andrew Pinski  <pinskia@physics.uc.edu>
X-Git-Tag: releases/gcc-4.0.0~4672
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c482362dd7c23fb89a324670636e8fee147774f;p=thirdparty%2Fgcc.git

004-09-23  Andrew Pinski  <pinskia@physics.uc.edu>

        PR c++/17618
        * cvt.c (cp_convert_to_pointer): Return early when the type is
        an error_mark_node.

From-SVN: r87978
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f5340eea333c..77020e049e39 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-23  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR c++/17618
+	* cvt.c (cp_convert_to_pointer): Return early when the type is
+	an error_mark_node.
+
 2004-09-23  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR c++/17596
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 5db41468c903..d93351e399e1 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -79,6 +79,8 @@ cp_convert_to_pointer (tree type, tree expr, bool force)
   tree intype = TREE_TYPE (expr);
   enum tree_code form;
   tree rval;
+  if (intype == error_mark_node)
+    return error_mark_node;
 
   if (IS_AGGR_TYPE (intype))
     {