diff options
| author | Tony Cook <tony@develop-help.com> | 2021-09-06 15:33:19 +1000 |
|---|---|---|
| committer | Tony Cook <tony@develop-help.com> | 2021-09-13 10:05:02 +1000 |
| commit | 2adc92a0e8937b18cd278515281fd462a5edf08e (patch) | |
| tree | e8e934f1f78a7bea3eb586aa1d43fa53a5f117cb | |
| parent | b61667640189f6de8d03dd67faf4f19915834bb4 (diff) | |
| download | perl-2adc92a0e8937b18cd278515281fd462a5edf08e.tar.gz | |
test and fix using T_CVREF_REFCOUNT as an output parameter
| -rw-r--r-- | ext/XS-Typemap/Typemap.pm | 1 | ||||
| -rw-r--r-- | ext/XS-Typemap/Typemap.xs | 6 | ||||
| -rw-r--r-- | ext/XS-Typemap/t/Typemap.t | 10 | ||||
| -rw-r--r-- | lib/ExtUtils/typemap | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/ext/XS-Typemap/Typemap.pm b/ext/XS-Typemap/Typemap.pm index 8d2fde9a71..3a4ee1cc3c 100644 --- a/ext/XS-Typemap/Typemap.pm +++ b/ext/XS-Typemap/Typemap.pm @@ -50,6 +50,7 @@ our @EXPORT = (qw/ T_HVREF_REFCOUNT_FIXED_output T_CVREF T_CVREF_REFCOUNT_FIXED + T_CVREF_REFCOUNT_FIXED_output T_SYSRET_fail T_SYSRET_pass T_UV T_IV diff --git a/ext/XS-Typemap/Typemap.xs b/ext/XS-Typemap/Typemap.xs index ed6f9d67b5..9250e3e110 100644 --- a/ext/XS-Typemap/Typemap.xs +++ b/ext/XS-Typemap/Typemap.xs @@ -383,6 +383,12 @@ T_CVREF_REFCOUNT_FIXED( cv ) OUTPUT: RETVAL +void +T_CVREF_REFCOUNT_FIXED_output( OUT cvref) + CV_FIXED *cvref; + CODE: + cvref = get_cv("XSLoader::load", 0); + SvREFCNT_inc(cvref); ## T_SYSRET diff --git a/ext/XS-Typemap/t/Typemap.t b/ext/XS-Typemap/t/Typemap.t index dade5a01f6..93a67bf031 100644 --- a/ext/XS-Typemap/t/Typemap.t +++ b/ext/XS-Typemap/t/Typemap.t @@ -6,7 +6,7 @@ BEGIN { } } -use Test::More tests => 167; +use Test::More tests => 170; use strict; #catch WARN_INTERNAL type errors, and anything else unexpected @@ -126,6 +126,14 @@ is( T_CVREF_REFCOUNT_FIXED($sub), $sub ); eval { T_CVREF_REFCOUNT_FIXED( \@array ) }; ok( $@ ); +# output only +SKIP:{ + my $cvr; + is_deeply([ T_CVREF_REFCOUNT_FIXED_output($cvr) ], [ ], "call with non-ref lvalue, no return value"); + ok(ref $cvr, "output parameter now a reference") + or skip "Not a reference", 1; + is($cvr, \&XSLoader::load, "ref to expected sub"); +} # T_SYSRET - system return values note("T_SYSRET"); diff --git a/lib/ExtUtils/typemap b/lib/ExtUtils/typemap index 239514b785..a07e83f901 100644 --- a/lib/ExtUtils/typemap +++ b/lib/ExtUtils/typemap @@ -331,7 +331,7 @@ T_HVREF_REFCOUNT_FIXED T_CVREF $arg = newRV((SV*)$var); T_CVREF_REFCOUNT_FIXED - $arg = newRV_noinc((SV*)$var); + ${ "$var" eq "RETVAL" ? \"$arg = newRV_noinc((SV*)$var);" : \"sv_setrv_noinc($arg, (SV*)$var);" } T_IV sv_setiv($arg, (IV)$var); T_UV |