public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-10030] Fortran: Fix ICE and clear incorrect error messages [PR114739]
@ 2024-04-18 17:07 Paul Thomas
  0 siblings, 0 replies; only message in thread
From: Paul Thomas @ 2024-04-18 17:07 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:e243d0feafa533141ef7e23820d5cc60cf33204a

commit r14-10030-ge243d0feafa533141ef7e23820d5cc60cf33204a
Author: Paul Thomas <pault@gcc.gnu.org>
Date:   Thu Apr 18 18:07:25 2024 +0100

    Fortran: Fix ICE and clear incorrect error messages [PR114739]
    
    2024-04-18  Paul Thomas  <pault@gcc.gnu.org>
    
    gcc/fortran
            PR fortran/114739
            * primary.cc (gfc_match_varspec): Check for default type before
            checking for derived types with the right component name.
    
    gcc/testsuite/
            PR fortran/114739
            * gfortran.dg/pr114739.f90: New test.
            * gfortran.dg/derived_comp_array_ref_8.f90: Add 'implicit none'
            for consistency with expected error message.
            * gfortran.dg/nullify_4.f90: ditto
            * gfortran.dg/pointer_init_6.f90: ditto
            * gfortran.dg/pr107397.f90: ditto
            * gfortran.dg/pr88138.f90: ditto

Diff:
---
 gcc/fortran/primary.cc                                 |  9 +++++++++
 gcc/testsuite/gfortran.dg/derived_comp_array_ref_8.f90 |  1 +
 gcc/testsuite/gfortran.dg/nullify_4.f90                |  1 +
 gcc/testsuite/gfortran.dg/pointer_init_6.f90           |  2 +-
 gcc/testsuite/gfortran.dg/pr107397.f90                 |  1 +
 gcc/testsuite/gfortran.dg/pr114739.f90                 | 11 +++++++++++
 gcc/testsuite/gfortran.dg/pr88138.f90                  |  1 +
 7 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/gcc/fortran/primary.cc b/gcc/fortran/primary.cc
index 5dd6875a4a6..606e84432be 100644
--- a/gcc/fortran/primary.cc
+++ b/gcc/fortran/primary.cc
@@ -2236,6 +2236,15 @@ gfc_match_varspec (gfc_expr *primary, int equiv_flag, bool sub_flag,
       match mm;
       old_loc = gfc_current_locus;
       mm = gfc_match_name (name);
+
+      /* Check to see if this has a default complex.  */
+      if (sym->ts.type == BT_UNKNOWN && tgt_expr == NULL
+	  && gfc_get_default_type (sym->name, sym->ns)->type != BT_UNKNOWN)
+	{
+	  gfc_set_default_type (sym, 0, sym->ns);
+	  primary->ts = sym->ts;
+	}
+
       /* This is a usable inquiry reference, if the symbol is already known
 	 to have a type or no derived types with a component of this name
 	 can be found.  If this was an inquiry reference with the same name
diff --git a/gcc/testsuite/gfortran.dg/derived_comp_array_ref_8.f90 b/gcc/testsuite/gfortran.dg/derived_comp_array_ref_8.f90
index 739f4adfb78..22dfdc668a6 100644
--- a/gcc/testsuite/gfortran.dg/derived_comp_array_ref_8.f90
+++ b/gcc/testsuite/gfortran.dg/derived_comp_array_ref_8.f90
@@ -2,6 +2,7 @@
 !
 ! PR fortran/52325
 !
+implicit none
 real :: f
 cc%a = 5 ! { dg-error "Symbol 'cc' at .1. has no IMPLICIT type" }
 f%a = 5  ! { dg-error "Unexpected '%' for nonderived-type variable 'f' at" }
diff --git a/gcc/testsuite/gfortran.dg/nullify_4.f90 b/gcc/testsuite/gfortran.dg/nullify_4.f90
index 0fd5056ee07..240110fabf8 100644
--- a/gcc/testsuite/gfortran.dg/nullify_4.f90
+++ b/gcc/testsuite/gfortran.dg/nullify_4.f90
@@ -3,6 +3,7 @@
 !
 ! Check error recovery; was crashing before.
 !
+implicit none
 real, pointer :: ptr
 nullify(ptr, mesh%coarser) ! { dg-error "Symbol 'mesh' at .1. has no IMPLICIT type" }
 end
diff --git a/gcc/testsuite/gfortran.dg/pointer_init_6.f90 b/gcc/testsuite/gfortran.dg/pointer_init_6.f90
index 3abad4ae179..477626e66bb 100644
--- a/gcc/testsuite/gfortran.dg/pointer_init_6.f90
+++ b/gcc/testsuite/gfortran.dg/pointer_init_6.f90
@@ -21,7 +21,7 @@ end module m1
 
 
 module m2
-
+ implicit none
  type :: t
    procedure(s), pointer, nopass :: ppc
  end type
diff --git a/gcc/testsuite/gfortran.dg/pr107397.f90 b/gcc/testsuite/gfortran.dg/pr107397.f90
index fd59bf16007..f77b4b00d00 100644
--- a/gcc/testsuite/gfortran.dg/pr107397.f90
+++ b/gcc/testsuite/gfortran.dg/pr107397.f90
@@ -1,6 +1,7 @@
 !{ dg-do compile }
 !
 program p
+  implicit none
   type t
     real :: a = 1.0
   end type
diff --git a/gcc/testsuite/gfortran.dg/pr114739.f90 b/gcc/testsuite/gfortran.dg/pr114739.f90
new file mode 100644
index 00000000000..eb82cb3f65b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr114739.f90
@@ -0,0 +1,11 @@
+! { dg-do compile }
+! The fix here was triggered by an ICE prior to r14-9489-g3fd46d859cda10
+! Before that gfortran gave an incorrect "no implicit type" error for all
+! three statements.
+program main
+  implicit complex(z)
+  implicit character(c)
+  z2%re = 1.
+  z2%im = 2.
+  print *, z2, c%kind
+end
diff --git a/gcc/testsuite/gfortran.dg/pr88138.f90 b/gcc/testsuite/gfortran.dg/pr88138.f90
index c4019a6ca2e..f1130cf2bab 100644
--- a/gcc/testsuite/gfortran.dg/pr88138.f90
+++ b/gcc/testsuite/gfortran.dg/pr88138.f90
@@ -1,5 +1,6 @@
 ! { dg-do compile }
 program p
+   implicit none
    type t
       character :: c = 'c'
    end type

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-04-18 17:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-18 17:07 [gcc r14-10030] Fortran: Fix ICE and clear incorrect error messages [PR114739] Paul Thomas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).