diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 91ff2c906f1..fa30d819ef1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr  5 15:12:18 MET DST 2000  Jan Hubicka  <jh@suse.cz>
+
+	* optimize.c (calls_setjmp_r): Use setjmp_call_p instead of
+	special_function_p.
+
 2000-04-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* cfns.gperf (hash, libc_name_p): Prototype.
diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c
index 0bd4b2115cd..5ba9ea7e34b 100644
--- a/gcc/cp/optimize.c
+++ b/gcc/cp/optimize.c
@@ -752,7 +752,7 @@ calls_setjmp_r (tp, walk_subtrees, data)
   if (TREE_CODE (*tp) != FUNCTION_DECL)
     return NULL_TREE;
 
-  return setjmp_call_p (*tp);
+  return setjmp_call_p (*tp) ? *tp : NULL_TREE;
 }
 
 /* Returns non-zero if FN calls `setjmp' or some other function that