2 files changed, 4 insertions, 6 deletions
diff --git a/embed.fnc b/embed.fnc
index 929fe5b87f..c8f96ecdc9 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -645,8 +645,8 @@ p	|void	|rxres_save	|NN void** rsp|NN REGEXP* prx
 #if !defined(HAS_RENAME)
 p	|I32	|same_dirent	|NN const char* a|NN const char* b
 #endif
-Apda	|char*	|savepv		|NN const char* pv
-Apda	|char*	|savepvn	|NN const char* pv|I32 len
+Apda	|char*	|savepv		|NULLOK const char* pv
+Apda	|char*	|savepvn	|NULLOK const char* pv|I32 len
 Apda	|char*	|savesharedpv	|NULLOK const char* pv
 Apda	|char*	|savesvpv	|NN SV* sv
 Ap	|void	|savestack_grow
diff --git a/proto.h b/proto.h
index d486b942bf..d09f802fa2 100644
--- a/proto.h
+++ b/proto.h
@@ -1816,13 +1816,11 @@ PERL_CALLCONV I32	Perl_same_dirent(pTHX_ const char* a, const char* b)
 #endif
 PERL_CALLCONV char*	Perl_savepv(pTHX_ const char* pv)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 
 PERL_CALLCONV char*	Perl_savepvn(pTHX_ const char* pv, I32 len)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 
 PERL_CALLCONV char*	Perl_savesharedpv(pTHX_ const char* pv)
 			__attribute__malloc__