Shave off the explict 1; from the end of lib/Config.pm

[perl5.git] / scope.c

diff --git a/scope.c b/scope.c
index 8420744..af10b71 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -13,6 +13,13 @@
  * levels..."
  */
 
+/* This file contains functions to manipulate several of Perl's stacks;
+ * in particular it contains code to push various types of things onto
+ * the savestack, then to pop them off and perform the correct restorative
+ * action for each one. This corresponds to the cleanup Perl does at
+ * each scope exit.
+ */
+
 #include "EXTERN.h"
 #define PERL_IN_SCOPE_C
 #include "perl.h"
@@ -100,20 +107,6 @@ Perl_cxinc(pTHX)
     return cxstack_ix + 1;
 }
 
-/* XXX for 5.8.X BINCOMPAT only */
-void
-Perl_push_return(pTHX_ OP *retop)
-{
-    Perl_croak(aTHX_ "panic: obsolete function push_return() called");
-}
-
-/* XXX for 5.8.X BINCOMPAT only */
-OP *
-Perl_pop_return(pTHX)
-{
-    Perl_croak(aTHX_ "panic: obsolete function pop_return() called");
-}
-
 void
 Perl_push_scope(pTHX)
 {
@@ -940,14 +933,8 @@ Perl_leave_scope(pTHX_ I32 base)
                    break;
                case SVt_PVCV:
                    Perl_croak(aTHX_ "panic: leave_scope pad code");
-               case SVt_RV:
-               case SVt_IV:
-               case SVt_NV:
-                   (void)SvOK_off(sv);
-                   break;
                default:
-                   (void)SvOK_off(sv);
-                   (void)SvOOK_off(sv);
+                   SvOK_off(sv);
                    break;
                }
                SvPADSTALE_on(sv); /* mark as no longer live */