re PR debug/46756 (-fcompare-debug failure (length) with ASSIGN)

gcc/ChangeLog:
PR debug/46756
* jump.c (mark_all_labels): Skip debug insns.
gcc/testsuite/ChangeLog:
PR debug/46756
* gfortran.dg/debug/pr46756.f: New.

From-SVN: r168014

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4595f63fb8f754469892d783fe4700f3b1701258..8f824e52fce5b300d0d06fa06b808de66ce74b0a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-18  Alexandre Oliva  <aoliva@redhat.com>
+
+       PR debug/46756
+       * jump.c (mark_all_labels): Skip debug insns.
+
 2010-12-18  Alexandre Oliva  <aoliva@redhat.com>
 
        PR debug/46782

diff --git a/gcc/jump.c b/gcc/jump.c
index c95c2116ba6e6aca9cb418eed213bf12090bc3dc..dc1d2f7b164b832e86cf5d1e29ba6c7fa2a04cfb 100644 (file)
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -194,7 +194,7 @@ mark_all_labels (rtx f)
   rtx prev_nonjump_insn = NULL;
 
   for (insn = f; insn; insn = NEXT_INSN (insn))
-    if (INSN_P (insn))
+    if (NONDEBUG_INSN_P (insn))
       {
        mark_jump_label (PATTERN (insn), insn, 0);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7687f98c1e5ae60c15f2c213645472e39a6aa97b..f720112b233d38665b9188d7519381ac04f51bc3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-18  Alexandre Oliva  <aoliva@redhat.com>
+
+       PR debug/46756
+       * gfortran.dg/debug/pr46756.f: New.
+
 2010-12-18  Alexandre Oliva  <aoliva@redhat.com>
 
        PR debug/46782

diff --git a/gcc/testsuite/gfortran.dg/debug/pr46756.f b/gcc/testsuite/gfortran.dg/debug/pr46756.f
new file mode 100644 (file)
index 0000000..fab06e3
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/debug/pr46756.f
@@ -0,0 +1,29 @@
+C PR debug/46756, reduced from ../20010519-1.f
+C { dg-do compile }
+C { dg-options "-O -fcompare-debug" }
+      LOGICAL QDISK,QDW,QCMPCT
+      LOGICAL LNOMA,LRAISE,LSCI,LBIG
+      ASSIGN 801 TO I800 ! { dg-warning "Deleted feature: ASSIGN" "Deleted feature: ASSIGN" }
+      GOTO 800
+ 801  CONTINUE
+      ASSIGN 761 TO I760 ! { dg-warning "Deleted feature: ASSIGN" "Deleted feature: ASSIGN" }
+ 761  CONTINUE
+      IF(LSCI) THEN
+         DO I=1,LENCM
+         ENDDO
+      ENDIF
+      DO WHILE((CVGMX.GT.TOLDIM).AND.(ITER.LT.ITMX))
+         IF(.NOT.QDW) THEN
+            ASSIGN 641 to I640 ! { dg-warning "Deleted feature: ASSIGN" "Deleted feature: ASSIGN" }
+            GOTO 640
+ 641        CONTINUE
+         ENDIF
+      ENDDO
+      GOTO 700
+ 640  CONTINUE
+      GOTO I640 ! { dg-warning "Deleted feature: Assigned" "Assigned GO TO" }
+ 700  CONTINUE
+      GOTO I760 ! { dg-warning "Deleted feature: Assigned" "Assigned GO TO" }
+ 800  CONTINUE
+      GOTO I800 ! { dg-warning "Deleted feature: Assigned" "Assigned GO TO" }
+      END