summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2004-09-23 20:04:21 +0000
committerpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2004-09-23 20:04:21 +0000
commit8bf328bfd4c370aef697ca5dd490c7e98c86ee66 (patch)
treefe80bf59edd24daf7ada1e7cbda698b9c568571c
parent88c822dde9feedfe69f913e7dd0eb79c3d2fe902 (diff)
downloadppe42-gcc-8bf328bfd4c370aef697ca5dd490c7e98c86ee66.tar.gz
ppe42-gcc-8bf328bfd4c370aef697ca5dd490c7e98c86ee66.zip
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87978 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/cvt.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f5340eea333..77020e049e3 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 5db41468c90..d93351e399e 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))
{
OpenPOWER on IntegriCloud