diff options
| author | Daniel Kraft <d@domob.eu> | 2008-09-18 14:02:50 +0200 |
|---|---|---|
| committer | Daniel Kraft <domob@gcc.gnu.org> | 2008-09-18 14:02:50 +0200 |
| commit | f25a62a5f34a0f33b00238c6c681edac038e1078 (patch) | |
| tree | e5471c68dc29810955e55c653efe13687946b17a /gcc/fortran/trans.h | |
| parent | e7089ecf1c8a67d5572ada8ecd3b3d99f420089c (diff) | |
| download | gcc-f25a62a5f34a0f33b00238c6c681edac038e1078.zip gcc-f25a62a5f34a0f33b00238c6c681edac038e1078.tar.gz gcc-f25a62a5f34a0f33b00238c6c681edac038e1078.tar.bz2 | |
re PR fortran/37507 (Print location in (DE)ALLOCATION errors)
2008-09-18 Daniel Kraft <d@domob.eu>
PR fortran/37507
* trans.h (gfc_trans_runtime_error): New method.
(gfc_trans_runtime_error_vararg): New method.
(gfc_allocate_array_with_status): New argument `expr' for locus/varname.
(gfc_deallocate_array_with_status): Ditto.
* trans-array.h (gfc_array_deallocate): Ditto.
* trans.c (gfc_trans_runtime_error): New method.
(gfc_trans_runtime_error_vararg): New method, moved parts of the code
from gfc_trans_runtime_check here.
(gfc_trans_runtime_error_check): Moved code partly to new method.
(gfc_call_malloc): Fix tab-indentation.
(gfc_allocate_array_with_status): New argument `expr' and call
gfc_trans_runtime_error for error reporting to include locus.
(gfc_deallocate_with_status): Ditto.
* trans-stmt.c (gfc_trans_deallocate): Pass expr as new argument.
* trans-array.c (gfc_array_allocate): Ditto.
(gfc_array_deallocate): New argument `expr', passed on.
(gfc_trans_dealloc_allocated): Pass NULL for expr.
* trans-openmp.c (gfc_omp_clause_default): Ditto.
2008-09-18 Daniel Kraft <d@domob.eu>
PR fortran/37507
* gfortran.dg/allocate_error_1.f90: New test.
* gfortran.dg/deallocate_error_1.f90: New test.
* gfortran.dg/deallocate_error_2.f90: New test.
From-SVN: r140451
Diffstat (limited to 'gcc/fortran/trans.h')
| -rw-r--r-- | gcc/fortran/trans.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h index 5d729ea..36553ea 100644 --- a/gcc/fortran/trans.h +++ b/gcc/fortran/trans.h @@ -450,6 +450,10 @@ void gfc_generate_constructors (void); /* Get the string length of an array constructor. */ bool get_array_ctor_strlen (stmtblock_t *, gfc_constructor *, tree *); +/* Generate a runtime error call. */ +tree gfc_trans_runtime_error (bool, locus*, const char*, ...); +tree gfc_trans_runtime_error_vararg (bool, locus*, const char*, va_list); + /* Generate a runtime warning/error check. */ void gfc_trans_runtime_check (bool, bool, tree, stmtblock_t *, locus *, const char *, ...); @@ -461,13 +465,13 @@ tree gfc_call_free (tree); tree gfc_call_malloc (stmtblock_t *, tree, tree); /* Allocate memory for arrays, with optional status variable. */ -tree gfc_allocate_array_with_status (stmtblock_t *, tree, tree, tree); +tree gfc_allocate_array_with_status (stmtblock_t*, tree, tree, tree, gfc_expr*); /* Allocate memory, with optional status variable. */ tree gfc_allocate_with_status (stmtblock_t *, tree, tree); /* Generate code to deallocate an array. */ -tree gfc_deallocate_with_status (tree, tree, bool); +tree gfc_deallocate_with_status (tree, tree, bool, gfc_expr*); /* Generate code to call realloc(). */ tree gfc_call_realloc (stmtblock_t *, tree, tree); |