5 files changed, 4 insertions, 23 deletions
diff --git a/MANIFEST b/MANIFEST
index d1cc4f19b1..4679c952ce 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3941,7 +3941,6 @@ ext/XS-APItest/README		XS::APItest extension
 ext/XS-APItest/t/addissub.t	test op check wrapping
 ext/XS-APItest/t/arrayexpr.t	test recursive descent expression parsing
 ext/XS-APItest/t/autoload.t	Test XS AUTOLOAD routines
-ext/XS-APItest/t/av.t		Test AV functions
 ext/XS-APItest/t/BHK.pm		Helper for ./blockhooks.t
 ext/XS-APItest/t/blockasexpr.t	test recursive descent block parsing
 ext/XS-APItest/t/blockhooks-csc.t	XS::APItest: more tests for PL_blockhooks
diff --git a/embed.fnc b/embed.fnc
index 592b11a11e..896f709fc9 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -219,7 +219,7 @@ ApdR	|SSize_t|av_len		|NN AV *av
 ApdR	|AV*	|av_make	|SSize_t size|NN SV **strp
 Apd	|SV*	|av_pop		|NN AV *av
 ApdoxM	|void	|av_create_and_push|NN AV **const avp|NN SV *const val
-Apd	|void	|av_push	|NN AV *av|NULLOK SV *val
+Apd	|void	|av_push	|NN AV *av|NN SV *val
 : Used in scope.c, and by Data::Alias
 EXp	|void	|av_reify	|NN AV *av
 ApdR	|SV*	|av_shift	|NN AV *av
diff --git a/ext/XS-APItest/APItest.xs b/ext/XS-APItest/APItest.xs
index 85e2b015ce..16d26dea33 100644
--- a/ext/XS-APItest/APItest.xs
+++ b/ext/XS-APItest/APItest.xs
@@ -3467,11 +3467,6 @@ alias_av(AV *av, IV ix, SV *sv)
     CODE:
 	av_store(av, ix, SvREFCNT_inc(sv));
 
-void
-av_pushnull(AV *av)
-    CODE:
-	av_push(av, NULL);
-
 MODULE = XS::APItest PACKAGE = XS::APItest::AUTOLOADtest
 
 int
diff --git a/ext/XS-APItest/t/av.t b/ext/XS-APItest/t/av.t
deleted file mode 100644
index 03e2aa61b9..0000000000
--- a/ext/XS-APItest/t/av.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!perl
-
-use Test::More tests => 4;
-use XS::APItest;
-
-av_pushnull \@_;
-is $#_, 0, '$#_ after av_push(@_, NULL)';
-ok !exists $_[0], '!exists $_[0] after av_push(@_,NULL)';
-
-use Tie::Array;
-tie @tied, 'Tie::StdArray';
-av_pushnull \@tied;
-is $#tied, 0, '$#tied after av_push(@tied, NULL)';
-is $tied[0], undef, '$tied[0] is undef after av_push(@tied,NULL)';
diff --git a/proto.h b/proto.h
index 060f864d81..88aaa0a6b1 100644
--- a/proto.h
+++ b/proto.h
@@ -221,9 +221,10 @@ PERL_CALLCONV SV*	Perl_av_pop(pTHX_ AV *av)
 	assert(av)
 
 PERL_CALLCONV void	Perl_av_push(pTHX_ AV *av, SV *val)
-			__attribute__nonnull__(pTHX_1);
+			__attribute__nonnull__(pTHX_1)
+			__attribute__nonnull__(pTHX_2);
 #define PERL_ARGS_ASSERT_AV_PUSH	\
-	assert(av)
+	assert(av); assert(val)
 
 PERL_CALLCONV void	Perl_av_reify(pTHX_ AV *av)
 			__attribute__nonnull__(pTHX_1);