aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAldy Hernandez <aldyh@gcc.gnu.org>2009-08-25 00:27:52 +0000
committerAldy Hernandez <aldyh@gcc.gnu.org>2009-08-25 00:27:52 +0000
commit033e7d21e5c989d3b0c3e6c42eb050f22f98d394 (patch)
tree22f1d0ffc1b0abc8e4a1ad4f9ce1ffd169706522
parent48bab68295d60c514cb057535dc3fdfc77fe7c23 (diff)
downloadgcc-033e7d21e5c989d3b0c3e6c42eb050f22f98d394.zip
gcc-033e7d21e5c989d3b0c3e6c42eb050f22f98d394.tar.gz
gcc-033e7d21e5c989d3b0c3e6c42eb050f22f98d394.tar.bz2
re PR debug/40660 (Weird break points with 4.5, works with 4.4)
fortran/ PR fortran/40660 * trans-io.c (build_dt): Pass UNKNOWN_LOCATION to build_call_expr_loc. (transfer_array_desc): Same. From-SVN: r151069
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/trans-io.c4
-rw-r--r--gcc/testsuite/gfortran.dg/PR40660.f9015
3 files changed, 24 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a5e5b44..0573336 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-24 Aldy Hernandez <aldyh@redhat.com>
+
+ PR fortran/40660
+ * trans-io.c (build_dt): Pass UNKNOWN_LOCATION to build_call_expr_loc.
+ (transfer_array_desc): Same.
+
2009-08-23 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/35754
@@ -41,6 +47,7 @@
in both modes to handle consecutive single quotes.
Test for extra characters in fmt, issue warning.
+>>>>>>> .r151068
2009-08-21 Janus Weil <janus@gcc.gnu.org>
PR fortran/41106
diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index 0f6e0a5..690464e 100644
--- a/gcc/fortran/trans-io.c
+++ b/gcc/fortran/trans-io.c
@@ -1802,7 +1802,7 @@ build_dt (tree function, gfc_code * code)
set_parameter_const (&block, var, IOPARM_common_flags, mask);
tmp = gfc_build_addr_expr (NULL_TREE, var);
- tmp = build_call_expr_loc (input_location,
+ tmp = build_call_expr_loc (UNKNOWN_LOCATION,
function, 1, tmp);
gfc_add_expr_to_block (&block, tmp);
@@ -2146,7 +2146,7 @@ transfer_array_desc (gfc_se * se, gfc_typespec * ts, tree addr_expr)
kind_arg = build_int_cst (NULL_TREE, ts->kind);
tmp = gfc_build_addr_expr (NULL_TREE, dt_parm);
- tmp = build_call_expr_loc (input_location,
+ tmp = build_call_expr_loc (UNKNOWN_LOCATION,
iocall[IOCALL_X_ARRAY], 4,
tmp, addr_expr, kind_arg, charlen_arg);
gfc_add_expr_to_block (&se->pre, tmp);
diff --git a/gcc/testsuite/gfortran.dg/PR40660.f90 b/gcc/testsuite/gfortran.dg/PR40660.f90
new file mode 100644
index 0000000..a269ca3
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/PR40660.f90
@@ -0,0 +1,15 @@
+! { dg-do compile }
+! { dg-options "-fdump-tree-original-lineno" }
+!
+! PR fortran/40660
+
+PROGRAM test
+ INTEGER, DIMENSION(3) :: a1,a2
+ a1 = 1
+ PRINT*, a1
+ a2 = 2
+end program test
+
+! { dg-final { scan-tree-dump-times ": 3\] _gfortran" 0 "original" } }
+! { dg-final { cleanup-tree-dump "original" } }
+