[project @ 2002-09-06 01:00:04 by ken]

perl made uglier to work around the perl 5.7/5.8 bug documented at
http://bugs6.perl.org/rt2/Ticket/Display.html?id=1760 and illustrated
by the seg fault of perl -e '("x\n" x 5000) =~ /(.*\n)+/'

MERGE TO STABLE

diff --git a/ghc/driver/split/ghc-split.lprl b/ghc/driver/split/ghc-split.lprl
index a101a2e..612b3d0 100644 (file)
--- a/ghc/driver/split/ghc-split.lprl
+++ b/ghc/driver/split/ghc-split.lprl
@@ -291,16 +291,24 @@ sub process_asm_block_iX86 {
     $str = "\.text\n\t.align 4\n" . $str;
 
     # remove/record any literal constants defined here
-    while ( ($str =~ /(\.?(LC\d+):\n(\t\.(ascii|string).*\n|\s*\.byte.*\n)+)/ )) {
+    # [perl made uglier to work around the perl 5.7/5.8 bug documented at
+    # http://bugs6.perl.org/rt2/Ticket/Display.html?id=1760 and illustrated
+    # by the seg fault of perl -e '("x\n" x 5000) =~ /(.*\n)+/'
+    # -- ccshan 2002-09-05]
+    while ( ($str =~ /(\.?(LC\d+):\n(\t\.(ascii|string).*\n|\s*\.byte.*\n){1,100})/ )) {
        local($label) = $2;
        local($body)  = $1;
+       local($prefix, $suffix, $*) = ($`, $', 0);
 
        &tidy_up_and_die(1,"Local constant label $label already defined!\n")
            if $LocalConstant{$label};
 
+       while ( $suffix =~ /^((\t\.(ascii|string).*\n|\s*\.byte.*\n){1,100})/ ) {
+           $body .= $1;
+           $suffix = $';
+       }
        $LocalConstant{$label} = $body;
-       
-       $str =~ s/\.?LC\d+:\n(\t\.(ascii|string).*\n|\s*\.byte.*\n)+//;
+       $str = $prefix . $suffix;
     }
 
     # inject definitions for any local constants now used herein