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

cvsuser     05/04/11 09:31:19

  Modified:    perl     pp_ctl.c pp_hot.c
  Log:
  Oops. Need this to do a better merge of 24228
  
  Revision  Changes    Path
  1.6       +0 -4      ponie/perl/pp_ctl.c
  
  Index: pp_ctl.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/pp_ctl.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- pp_ctl.c	11 Apr 2005 15:30:21 -0000	1.5
  +++ pp_ctl.c	11 Apr 2005 16:31:19 -0000	1.6
  @@ -2425,16 +2425,12 @@
   		    SV *sv = GvSV(PL_DBsub);
   		    CV *gotocv;
   
  -		    /* FIXME once we figure out just what the debugger is up to
  -		     */
    		    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 {
   			gv_efullname3(sv, CvGV(cv), Nullch);
  
  
  
  1.11      +0 -1      ponie/perl/pp_hot.c
  
  Index: pp_hot.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/pp_hot.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- pp_hot.c	11 Apr 2005 15:30:21 -0000	1.10
  +++ pp_hot.c	11 Apr 2005 16:31:19 -0000	1.11
  @@ -2573,7 +2573,6 @@
   {
       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);