cvs commit: ponie/perl perl.c pp_ctl.c pp_hot.c

cvsuser     05/04/11 08:30:21

  Modified:    perl     perl.c pp_ctl.c pp_hot.c
  Log:
  Incorporate blead change 24228 (remove &SvIVX())
  
  Revision  Changes    Path
  1.16      +0 -1      ponie/perl/perl.c
  
  Index: perl.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/perl.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- perl.c	4 Apr 2005 17:46:12 -0000	1.15
  +++ perl.c	11 Apr 2005 15:30:21 -0000	1.16
  @@ -3983,7 +3983,6 @@
       PL_DBgv = gv_fetchpv("DB::DB", GV_ADDMULTI, SVt_PVGV);
       PL_DBline = gv_fetchpv("DB::dbline", GV_ADDMULTI, SVt_PVAV);
       PL_DBsub = gv_HVadd(gv_fetchpv("DB::sub", GV_ADDMULTI, SVt_PVHV));
  -    sv_upgrade(GvSV(PL_DBsub), SVt_IV);	/* IVX accessed if PERLDB_SUB_NN */
       PL_DBsingle = GvSV((gv_fetchpv("DB::single", GV_ADDMULTI, SVt_PV)));
       sv_setiv(PL_DBsingle, 0);
       PL_DBtrace = GvSV((gv_fetchpv("DB::trace", GV_ADDMULTI, SVt_PV)));
  
  
  
  1.5       +5 -4      ponie/perl/pp_ctl.c
  
  Index: pp_ctl.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/pp_ctl.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- pp_ctl.c	10 Apr 2005 04:17:49 -0000	1.4
  +++ pp_ctl.c	11 Apr 2005 15:30:21 -0000	1.5
  @@ -2427,15 +2427,16 @@
   
   		    /* FIXME once we figure out just what the debugger is up to
   		     */
  -		    save_item(sv);
  -		    if (PERLDB_SUB_NN) {
  -			(void)SvUPGRADE(sv, SVt_PVIV);
  + 		    save_item(sv);
  +  		    if (PERLDB_SUB_NN) {
  +			int type = SvTYPE(sv);
  +			if (type < SVt_PVIV && type != SVt_IV)
  +			    sv_upgrade(sv, SVt_PVIV);
   			(void)SvIOK_on(sv);
   			/*save_item(sv);*/
   			SAVEIV(SvIVX(sv));
   			SvIV_set(sv, PTR2IV(cv)); /* Do it the quickest way */
   		    } else {
  -			save_item(sv);
   			gv_efullname3(sv, CvGV(cv), Nullch);
   		    }
   		    if (  PERLDB_GOTO
  
  
  
  1.10      +4 -4      ponie/perl/pp_hot.c
  
  Index: pp_hot.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/pp_hot.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- pp_hot.c	10 Apr 2005 04:17:49 -0000	1.9
  +++ pp_hot.c	11 Apr 2005 15:30:21 -0000	1.10
  @@ -2574,10 +2574,10 @@
       SV *dbsv = GvSV(PL_DBsub);
   
       /* FIXME once we figure out just what the debugger is up to */
  +    save_item(dbsv);
       if (!PERLDB_SUB_NN) {
   	GV *gv = CvGV(cv);
   
  -	save_item(dbsv);
   	if ( (CvFLAGS(cv) & (CVf_ANON | CVf_CLONED))
   	     || strEQ(GvNAME(gv), "END")
   	     || ((GvCV(gv) != cv) && /* Could be imported, and old sub redefined. */
  @@ -2594,10 +2594,10 @@
   	}
       }
       else {
  -	(void)SvUPGRADE(dbsv, SVt_PVIV);
  +	int type = SvTYPE(dbsv);
  +	if (type < SVt_PVIV && type != SVt_IV)
  +	    sv_upgrade(dbsv, SVt_PVIV);
   	(void)SvIOK_on(dbsv);
  -	/*save_item(dbsv);*/
  -	SAVEIV(SvIVX(dbsv));
   	SvIV_set(dbsv, PTR2IV(cv));	/* Do it the quickest way  */
       }