OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trans.c (trans_code): Set backend locus early.

Browse Source 
* trans.c (trans_code): Set backend locus early.
	* trans-decl.c (gfc_get_fake_result_decl): Use source location
	of the function instead of current input_location.

	* gfortran.dg/gomp/pr44036-1.f90: Adjust.

From-SVN: r159388
This commit is contained in:
Jakub Jelinek 2010-05-14 09:40:06 +02:00 committed by Jakub Jelinek
parent c46a5e284e
commit 88e09c797b
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2010-05-14 Jakub Jelinek <jakub@redhat.com>
* trans.c (trans_code): Set backend locus early.
* trans-decl.c (gfc_get_fake_result_decl): Use source location
of the function instead of current input_location.
2010-05-13 Daniel Franke <franke.daniel@gmail.com> 2010-05-13 Daniel Franke <franke.daniel@gmail.com>
PR fortran/35779 PR fortran/35779

4
gcc/fortran/trans-decl.c
View File

@ -2283,11 +2283,11 @@ gfc_get_fake_result_decl (gfc_symbol * sym, int parent_flag)
IDENTIFIER_POINTER (DECL_NAME (this_function_decl))); IDENTIFIER_POINTER (DECL_NAME (this_function_decl)));
if (!sym->attr.mixed_entry_master && sym->attr.function) if (!sym->attr.mixed_entry_master && sym->attr.function)
decl = build_decl (input_location, decl = build_decl (DECL_SOURCE_LOCATION (this_function_decl),
VAR_DECL, get_identifier (name), VAR_DECL, get_identifier (name),
gfc_sym_type (sym)); gfc_sym_type (sym));
else else
decl = build_decl (input_location, decl = build_decl (DECL_SOURCE_LOCATION (this_function_decl),
VAR_DECL, get_identifier (name), VAR_DECL, get_identifier (name),
TREE_TYPE (TREE_TYPE (this_function_decl))); TREE_TYPE (TREE_TYPE (this_function_decl)));
DECL_ARTIFICIAL (decl) = 1; DECL_ARTIFICIAL (decl) = 1;

2
gcc/fortran/trans.c
View File

@ -1067,6 +1067,8 @@ trans_code (gfc_code * code, tree cond)
gfc_add_expr_to_block (&block, res); gfc_add_expr_to_block (&block, res);
} }
gfc_set_backend_locus (&code->loc);
switch (code->op) switch (code->op)
{ {
case EXEC_NOP: case EXEC_NOP:

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2010-05-14 Jakub Jelinek <jakub@redhat.com>
* gfortran.dg/gomp/pr44036-1.f90: Adjust.
2010-05-14 Shujing Zhao <pearly.zhao@oracle.com> 2010-05-14 Shujing Zhao <pearly.zhao@oracle.com>
PR c++/30566 PR c++/30566

2
gcc/testsuite/gfortran.dg/gomp/pr44036-1.f90
View File

@ -12,7 +12,7 @@ subroutine foo(a, b)
x = a(4) x = a(4)
!$omp end parallel !$omp end parallel
!$omp parallel default(none) private (x) ! { dg-error "enclosing parallel" } !$omp parallel default(none) private (x) ! { dg-error "enclosing parallel" }
x = b(5) ! { dg-error "not specified in" "" { target *-*-* } 11 } x = b(5) ! { dg-error "not specified in" }
!$omp end parallel !$omp end parallel
!$omp parallel default(none) private (x) !$omp parallel default(none) private (x)
x = c(6) x = c(6)