diff options
| author | Mikael Morin <mikael@gcc.gnu.org> | 2015-10-04 12:30:16 +0000 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2015-10-04 12:30:16 +0000 |
| commit | 2b3f52a2d0fb22bab9a3fdf94eaaa3d6829608fd (patch) | |
| tree | 0e37a535c2fb1ad4175640b01e0f4518a0f4ece7 /gcc/fortran/match.c | |
| parent | 6dcab5071487cfb42b4414d08c517210fac94d00 (diff) | |
| download | gcc-2b3f52a2d0fb22bab9a3fdf94eaaa3d6829608fd.zip gcc-2b3f52a2d0fb22bab9a3fdf94eaaa3d6829608fd.tar.gz gcc-2b3f52a2d0fb22bab9a3fdf94eaaa3d6829608fd.tar.bz2 | |
Fix fortran common-related error recovery ICE.
Upon reverting a symbol in a common block (after throwing an error),
the compiler was ICEing because the symbol's common_block field was set,
but the symbol was not in the common block's list of symbols.
Fixed by both adding the symbol to the common block list and setting
the symbol's common_block field at the same time.
Furthermore, the gfc_add_in_common call is delayed and its result is
ignored, so that its error messages are ignored and the compiler has
the opportunity to give a better error message.
Another gfc_add_in_common call is added later during resolution
to emit again the missing errors.
PR fortran/67758
gcc/fortran/
* match.c (gfc_match_common): Delay the common_block pointer
assignment after error checking.
Delay the call to gfc_add_in_common attribute after the handling
of array specs.
* resolve.c (resolve_common_vars): Call gfc_add_in_common again.
gcc/testsuite/
* gfortran.dg/common_24.f: New.
From-SVN: r228457
Diffstat (limited to 'gcc/fortran/match.c')
| -rw-r--r-- | gcc/fortran/match.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index a50ec2d..2363004 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -4330,10 +4330,6 @@ gfc_match_common (void) if (m == MATCH_NO) goto syntax; - /* Store a ref to the common block for error checking. */ - sym->common_block = t; - sym->common_block->refs++; - /* See if we know the current common block is bind(c), and if so, then see if we can check if the symbol is (which it'll need to be). This can happen if the bind(c) attr stmt was @@ -4376,8 +4372,8 @@ gfc_match_common (void) goto cleanup; } - if (!gfc_add_in_common (&sym->attr, sym->name, NULL)) - goto cleanup; + sym->common_block = t; + sym->common_block->refs++; if (tail != NULL) tail->common_next = sym; @@ -4416,6 +4412,10 @@ gfc_match_common (void) } + /* Add the in_common attribute, but ignore the reported errors + if any, and continue matching. */ + gfc_add_in_common (&sym->attr, sym->name, NULL); + sym->common_head = t; /* Check to see if the symbol is already in an equivalence group. |