[svn:parrot] r47970 - branches/dynop_mapping/src

plobsing at svn.parrot.org plobsing at svn.parrot.org
Sat Jul 3 07:37:55 UTC 2010


Author: plobsing
Date: Sat Jul  3 07:37:55 2010
New Revision: 47970
URL: https://trac.parrot.org/parrot/changeset/47970

Log:
eliminate creation of duplicate debug statements in pbc_merge

Modified:
   branches/dynop_mapping/src/packfile.c
   branches/dynop_mapping/src/pbc_merge.c

Modified: branches/dynop_mapping/src/packfile.c
==============================================================================
--- branches/dynop_mapping/src/packfile.c	Sat Jul  3 00:45:37 2010	(r47969)
+++ branches/dynop_mapping/src/packfile.c	Sat Jul  3 07:37:55 2010	(r47970)
@@ -2172,14 +2172,11 @@
                      (int)opcode, (int)seg->file_offset);
         }
 
-        /* XXX TODO: pbc_merge fouls this up */
-#if 0
         if (i) {
             PackFile_Segment *last = dir->segments[i - 1];
             if (last->file_offset + last->op_count != seg->file_offset)
                 fprintf(stderr, "section: sections are not back to back\n");
         }
-#endif
 
         make_code_pointers(seg);
 

Modified: branches/dynop_mapping/src/pbc_merge.c
==============================================================================
--- branches/dynop_mapping/src/pbc_merge.c	Sat Jul  3 00:45:37 2010	(r47969)
+++ branches/dynop_mapping/src/pbc_merge.c	Sat Jul  3 07:37:55 2010	(r47970)
@@ -604,7 +604,6 @@
     /* Create merged debug segment. Replace created data and mappings
        with merged ones we have created. */
     debug_seg = Parrot_new_debug_seg(interp, bc, num_lines);
-    PackFile_add_segment(interp, &pf->directory, (PackFile_Segment*)debug_seg);
     mem_gc_free(interp, debug_seg->base.data);
     debug_seg->base.data    = lines;
     mem_gc_free(interp, debug_seg->mappings);


More information about the parrot-commits mailing list