test and fix using T_AVREF_REFCOUNT as an output parameter

Perl · Sep 9, 2021 · 08d4598 · 08d4598
1 parent 7d8e6a9
commit 08d4598
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/ext/XS-Typemap/Typemap.pm b/ext/XS-Typemap/Typemap.pm
@@ -44,6 +44,7 @@ our @EXPORT = (qw/
            T_SVREF_REFCOUNT_FIXED_output
 	   T_AVREF
 	   T_AVREF_REFCOUNT_FIXED
+           T_AVREF_REFCOUNT_FIXED_output
 	   T_HVREF
 	   T_HVREF_REFCOUNT_FIXED
 	   T_HVREF_REFCOUNT_FIXED_output

diff --git a/ext/XS-Typemap/Typemap.xs b/ext/XS-Typemap/Typemap.xs
@@ -325,6 +325,12 @@ T_AVREF_REFCOUNT_FIXED( av )
  OUTPUT:
   RETVAL
 
+void
+T_AVREF_REFCOUNT_FIXED_output( OUT avref)
+  AV_FIXED *avref;
+ CODE:
+  avref = newAV();
+  av_push(avref, newSVpvs("test"));
 
 ## T_HVREF
 

diff --git a/ext/XS-Typemap/t/Typemap.t b/ext/XS-Typemap/t/Typemap.t
@@ -6,7 +6,7 @@ BEGIN {
     }
 }
 
-use Test::More tests => 164;
+use Test::More tests => 167;
 
 use strict;
 #catch WARN_INTERNAL type errors, and anything else unexpected
@@ -79,6 +79,14 @@ is( T_AVREF_REFCOUNT_FIXED(\@array), \@array);
 eval { T_AVREF_REFCOUNT_FIXED( \$sv ) };
 ok( $@ );
 
+# output only
+SKIP:{
+   my $avr;
+   is_deeply([ T_AVREF_REFCOUNT_FIXED_output($avr) ], [ ], "call with non-ref lvalue, no return value");
+   ok(ref $avr, "output parameter now a reference")
+     or skip "Not a reference", 1;
+   is_deeply($avr, [ "test" ], "has expected entry");
+}
 
 # T_HVREF - reference to a perl Hash
 note("T_HVREF");

diff --git a/lib/ExtUtils/typemap b/lib/ExtUtils/typemap
@@ -323,7 +323,7 @@ T_SVREF_REFCOUNT_FIXED
 T_AVREF
 	$arg = newRV((SV*)$var);
 T_AVREF_REFCOUNT_FIXED
-	$arg = newRV_noinc((SV*)$var);
+	${ "$var" eq "RETVAL" ? \"$arg = newRV_noinc((SV*)$var);" : \"sv_setrv_noinc($arg, (SV*)$var);" }
 T_HVREF
 	$arg = newRV((SV*)$var);
 T_HVREF_REFCOUNT_FIXED