(set_decl_{origin_self,abstract_flags}): Treat a DECL_INITIAL of

error_mark_node the same as one of NULL_TREE.

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

diff --git a/gcc/integrate.c b/gcc/integrate.c
index 09382a8..d00c632 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -2926,7 +2926,8 @@ set_decl_origin_self (decl)
 
          for (arg = DECL_ARGUMENTS (decl); arg; arg = TREE_CHAIN (arg))
            DECL_ABSTRACT_ORIGIN (arg) = arg;
-         if (DECL_INITIAL (decl) != NULL_TREE)
+         if (DECL_INITIAL (decl) != NULL_TREE
+             && DECL_INITIAL (decl) != error_mark_node)
            set_block_origin_self (DECL_INITIAL (decl));
        }
     }
@@ -2981,7 +2982,8 @@ set_decl_abstract_flags (decl, setting)
 
       for (arg = DECL_ARGUMENTS (decl); arg; arg = TREE_CHAIN (arg))
        DECL_ABSTRACT (arg) = setting;
-      if (DECL_INITIAL (decl) != NULL_TREE)
+      if (DECL_INITIAL (decl) != NULL_TREE
+         && DECL_INITIAL (decl) != error_mark_node)
        set_block_abstract_flags (DECL_INITIAL (decl), setting);
     }
 }