c++, contracts: improve finish_function_contracts guard

iains · iains · commit 0cb63e7247e5 · 2025-02-22T11:17:09.000Z
diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc
@@ -3122,7 +3122,8 @@ finish_function_contracts (tree fndecl)
 {
   /* If the guarded func is either already decided to be ill-formed or is
      not yet complete return early.  */
-  if (fndecl == error_mark_node
+  if (error_operand_p (fndecl)
+      || !DECL_INITIAL (fndecl)
       || DECL_INITIAL (fndecl) == error_mark_node)
     return;
 

Original file line number	Diff line number	Diff line change
`@@ -3122,7 +3122,8 @@ finish_function_contracts (tree fndecl)`
`3122`	`3122`	`{`
`3123`	`3123`	`/* If the guarded func is either already decided to be ill-formed or is`
`3124`	`3124`	`not yet complete return early. */`
`3125`		`- if (fndecl == error_mark_node`
	`3125`	`+ if (error_operand_p (fndecl)`
	`3126`	`+ \|\| !DECL_INITIAL (fndecl)`
`3126`	`3127`	`\|\| DECL_INITIAL (fndecl) == error_mark_node)`
`3127`	`3128`	`return;`
`3128`	`3129`