re PR fortran/19195 (gfortran: ICE in final_scan_insn, at final.c:1843)

fortran/
2005-06-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
	Erik Schnetter  <schnetter@aei.mpg.de>

	PR fortran/19195
	* trans.c (gfc_get_backend_locus): Remove unnecessary adjustment,
	remove FIXME comment.

testsuite/
2005-06-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>

	PR fortran/19195
	* gfortran.dg/debug_1.f90: New test.

Co-Authored-By: Erik Schnetter <schnetter@aei.mpg.de>
From-SVN: r100603

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index bc8c7b495f7790a2b85a131da32b8cfb4ee5d82a..27be5f59881f01c967975d784c945d4ff0137f50 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
+       Erik Schnetter  <schnetter@aei.mpg.de>
+
+       * trans.c (gfc_get_backend_locus): Remove unnecessary adjustment,
+       remove FIXME comment. 
+
 2005-06-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
 
        * match.c (match_forall_iterator): Don't immediately give error if '='

diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index c4ae36674dee2452ea7fa8f733a477c961e82fb9..fe41654f1c933a0b14b48ae37826d5a79c489474 100644 (file)
--- a/gcc/fortran/trans.c
+++ b/gcc/fortran/trans.c
@@ -437,9 +437,9 @@ gfc_get_backend_locus (locus * loc)
 {
   loc->lb = gfc_getmem (sizeof (gfc_linebuf));    
 #ifdef USE_MAPPED_LOCATION
-  loc->lb->location = input_location; /* FIXME adjust?? */
+  loc->lb->location = input_location;
 #else
-  loc->lb->linenum = input_line - 1;
+  loc->lb->linenum = input_line;
 #endif
   loc->lb->file = gfc_current_backend_file;
 }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index db1bea636287870d11de171e0e931782959dd4d3..aba8829e76f57412777813d8088b63a43e252278 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
 
+       PR fortran/19195
+       * gfortran.dg/debug_1.f90: New test.
+       
        * gfortran.dg/forall_1.f90: New test.
 
 2005-06-04  Erik Edelmann  <erik.edelmann@iki.fi>

diff --git a/gcc/testsuite/gfortran.dg/debug_1.f90 b/gcc/testsuite/gfortran.dg/debug_1.f90
new file mode 100644 (file)
index 0000000..808f41c
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/debug_1.f90
@@ -0,0 +1,20 @@
+subroutine gfc_debug_bug (n,m,k,ax,bx,c)
+! above line must be the first line
+! { dg-do compile }
+! { dg-options "-g" }
+! PR 19195
+! we set line numbers wrongly, which made the compiler choke when emitting
+! debug information.
+  implicit none
+  integer :: n, m
+  integer :: k(n+m)
+  real    :: ax(:), bx(n), c(n+m)
+
+  integer :: i
+  real    :: f
+
+  i = k(n)
+  f = c(n)
+  f = bx(n)
+  f = ax(n)
+end subroutine gfc_debug_bug