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 f5340eea333c587951da22beec7acf325747b7df..77020e049e393905f5a340dc24ee9bf0e7a7d3c7 100644 (file)
--- 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 5db41468c903e5cf46246d0c473acf121171b78d..d93351e399e1474272646f73156a4178b119e465 100644 (file)
--- 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))
     {