Doc & feature patch for Thread::Queue

[perl5.git] / scope.c

diff --git a/scope.c b/scope.c
index 6de1841..7a0a578 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -42,6 +42,26 @@ stack_grow(SV **sp, SV **p, int n)
 #define GROW(old) ((old) + 1)
 #endif
 
+PERL_SI *
+new_stackinfo(I32 stitems, I32 cxitems)
+{
+    PERL_SI *si;
+    PERL_CONTEXT *cxt;
+    New(56, si, 1, PERL_SI);
+    si->si_stack = newAV();
+    AvREAL_off(si->si_stack);
+    av_extend(si->si_stack, stitems > 0 ? stitems-1 : 0);
+    AvALLOC(si->si_stack)[0] = &sv_undef;
+    AvFILLp(si->si_stack) = 0;
+    si->si_prev = 0;
+    si->si_next = 0;
+    si->si_cxmax = cxitems - 1;
+    si->si_cxix = -1;
+    si->si_type = SI_UNDEF;
+    New(56, si->si_cxstack, cxitems, PERL_CONTEXT);
+    return si;
+}
+
 I32
 cxinc(void)
 {
@@ -132,7 +152,7 @@ free_tmps(void)
     }
 }
 
-static SV *
+STATIC SV *
 save_scalar_at(SV **sptr)
 {
     dTHR;
@@ -167,11 +187,12 @@ SV *
 save_scalar(GV *gv)
 {
     dTHR;
+    SV **sptr = &GvSV(gv);
     SSCHECK(3);
-    SSPUSHPTR(gv);
-    SSPUSHPTR(GvSV(gv));
+    SSPUSHPTR(SvREFCNT_inc(gv));
+    SSPUSHPTR(SvREFCNT_inc(*sptr));
     SSPUSHINT(SAVEt_SV);
-    return save_scalar_at(&GvSV(gv));
+    return save_scalar_at(sptr);
 }
 
 SV*
@@ -180,7 +201,7 @@ save_svref(SV **sptr)
     dTHR;
     SSCHECK(3);
     SSPUSHPTR(sptr);
-    SSPUSHPTR(*sptr);
+    SSPUSHPTR(SvREFCNT_inc(*sptr));
     SSPUSHINT(SAVEt_SVREF);
     return save_scalar_at(sptr);
 }
@@ -440,35 +461,11 @@ save_delete(HV *hv, char *key, I32 klen)
     SSCHECK(4);
     SSPUSHINT(klen);
     SSPUSHPTR(key);
-    SSPUSHPTR(hv);
+    SSPUSHPTR(SvREFCNT_inc(hv));
     SSPUSHINT(SAVEt_DELETE);
 }
 
 void
-save_aelem(AV *av, I32 idx, SV **sptr)
-{
-    dTHR;
-    SSCHECK(4);
-    SSPUSHPTR(av);
-    SSPUSHINT(idx);
-    SSPUSHPTR(*sptr);
-    SSPUSHINT(SAVEt_AELEM);
-    save_scalar_at(sptr);
-}
-
-void
-save_helem(HV *hv, SV *key, SV **sptr)
-{
-    dTHR;
-    SSCHECK(4);
-    SSPUSHPTR(hv);
-    SSPUSHPTR(key);
-    SSPUSHPTR(*sptr);
-    SSPUSHINT(SAVEt_HELEM);
-    save_scalar_at(sptr);
-}
-
-void
 save_list(register SV **sarg, I32 maxsarg)
 {
     dTHR;
@@ -486,7 +483,11 @@ save_list(register SV **sarg, I32 maxsarg)
 }
 
 void
+#ifdef PERL_OBJECT
+save_destructor(DESTRUCTORFUNC f, void* p)
+#else
 save_destructor(void (*f) (void *), void *p)
+#endif
 {
     dTHR;
     SSCHECK(3);
@@ -496,6 +497,30 @@ save_destructor(void (*f) (void *), void *p)
 }
 
 void
+save_aelem(AV *av, I32 idx, SV **sptr)
+{
+    dTHR;
+    SSCHECK(4);
+    SSPUSHPTR(SvREFCNT_inc(av));
+    SSPUSHINT(idx);
+    SSPUSHPTR(SvREFCNT_inc(*sptr));
+    SSPUSHINT(SAVEt_AELEM);
+    save_scalar_at(sptr);
+}
+
+void
+save_helem(HV *hv, SV *key, SV **sptr)
+{
+    dTHR;
+    SSCHECK(4);
+    SSPUSHPTR(SvREFCNT_inc(hv));
+    SSPUSHPTR(SvREFCNT_inc(key));
+    SSPUSHPTR(SvREFCNT_inc(*sptr));
+    SSPUSHINT(SAVEt_HELEM);
+    save_scalar_at(sptr);
+}
+
+void
 save_op(void)
 {
     dTHR;
@@ -532,6 +557,7 @@ leave_scope(I32 base)
            value = (SV*)SSPOPPTR;
            gv = (GV*)SSPOPPTR;
            ptr = &GvSV(gv);
+           SvREFCNT_dec(gv);
            goto restore_sv;
         case SAVEt_SVREF:                      /* scalar reference */
            value = (SV*)SSPOPPTR;
@@ -563,6 +589,7 @@ leave_scope(I32 base)
            localizing = 2;
            SvSETMAGIC(value);
            localizing = 0;
+           SvREFCNT_dec(value);
             break;
         case SAVEt_AV:                         /* array reference */
            av = (AV*)SSPOPPTR;
@@ -719,11 +746,12 @@ leave_scope(I32 base)
            hv = (HV*)ptr;
            ptr = SSPOPPTR;
            (void)hv_delete(hv, (char*)ptr, (U32)SSPOPINT, G_DISCARD);
+           SvREFCNT_dec(hv);
            Safefree(ptr);
            break;
        case SAVEt_DESTRUCTOR:
            ptr = SSPOPPTR;
-           (*SSPOPDPTR)(ptr);
+           (CALLDESTRUCTOR)(ptr);
            break;
        case SAVEt_REGCONTEXT:
            i = SSPOPINT;
@@ -738,14 +766,38 @@ leave_scope(I32 base)
            i = SSPOPINT;
            av = (AV*)SSPOPPTR;
            ptr = av_fetch(av,i,1);
-           goto restore_sv;
+           if (ptr) {
+               sv = *(SV**)ptr;
+               if (sv && sv != &sv_undef) {
+                   if (SvRMAGICAL(av) && mg_find((SV*)av, 'P'))
+                       (void)SvREFCNT_inc(sv);
+                   SvREFCNT_dec(av);
+                   goto restore_sv;
+               }
+           }
+           SvREFCNT_dec(av);
+           SvREFCNT_dec(value);
+           break;
        case SAVEt_HELEM:               /* hash element */
            value = (SV*)SSPOPPTR;
            sv = (SV*)SSPOPPTR;
            hv = (HV*)SSPOPPTR;
            ptr = hv_fetch_ent(hv, sv, 1, 0);
-           ptr = &HeVAL((HE*)ptr);
-           goto restore_sv;
+           if (ptr) {
+               SV *oval = HeVAL((HE*)ptr);
+               if (oval && oval != &sv_undef) {
+                   ptr = &HeVAL((HE*)ptr);
+                   if (SvRMAGICAL(hv) && mg_find((SV*)hv, 'P'))
+                       (void)SvREFCNT_inc(*(SV**)ptr);
+                   SvREFCNT_dec(hv);
+                   SvREFCNT_dec(sv);
+                   goto restore_sv;
+               }
+           }
+           SvREFCNT_dec(hv);
+           SvREFCNT_dec(sv);
+           SvREFCNT_dec(value);
+           break;
        case SAVEt_OP:
            op = (OP*)SSPOPPTR;
            break;
@@ -755,11 +807,10 @@ leave_scope(I32 base)
     }
 }
 
-#ifdef DEBUGGING
-
 void
 cx_dump(PERL_CONTEXT *cx)
 {
+#ifdef DEBUGGING
     dTHR;
     PerlIO_printf(Perl_debug_log, "CX %ld = %s\n", (long)(cx - cxstack), block_type[cx->cx_type]);
     if (cx->cx_type != CXt_SUBST) {
@@ -848,5 +899,5 @@ cx_dump(PERL_CONTEXT *cx)
                (long)cx->sb_rxres);
        break;
     }
+#endif /* DEBUGGING */
 }
-#endif