PR fortran/95053 - ICE in gfc_divide(): Bad basic type

	The fix for PR 93499 introduced a too strict check in gfc_divide
	that could trigger errors in the early parsing phase.  Relax the
	check and defer to a later stage.

gcc/fortran/

2020-05-11  Harald Anlauf  <anlauf@gmx.de>

	PR fortran/95053
	* arith.c (gfc_divide): Do not error out if operand 2 is
	non-numeric.  Defer checks to later stage.

gcc/testsuite/

2020-05-11  Harald Anlauf  <anlauf@gmx.de>

	PR fortran/95053
	* gfortran.dg/pr95053.f: New test.

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a1a625abc1d1c53a4e44a7d2891f3a83c296b29e..9f7b60e2ef96245ef426cd8695154c2b6fda6db8 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-11  Harald Anlauf  <anlauf@gmx.de>
+
+       PR fortran/95053
+       * arith.c (gfc_divide): Do not error out if operand 2 is
+       non-numeric.  Defer checks to later stage.
+
 2020-05-11  Tobias Burnus  <tobias@codesourcery.com>
 
        PR fortran/94672

diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c
index 1cd0867a941991328a001c8c177732f7cdfdafe0..dd72f44d3779cb2bef0dff1f10d98d65d3f43eb7 100644 (file)
--- a/gcc/fortran/arith.c
+++ b/gcc/fortran/arith.c
@@ -1828,7 +1828,8 @@ gfc_divide (gfc_expr *op1, gfc_expr *op2)
            rc = ARITH_DIV0;
          break;
        default:
-         gfc_internal_error ("gfc_divide(): Bad basic type");
+         /* basic type is non-numeric, handle this elsewhere.  */
+         break;
        }
       if (rc == ARITH_DIV0)
        {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 158cf3857baf6c9e5b5c5f08bd999cf80490e044..99d06830cc14d37bdeee53e1c0afec4ef8e1112c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-11  Harald Anlauf  <anlauf@gmx.de>
+
+       PR fortran/95053
+       * gfortran.dg/pr95053.f: New test.
+
 2020-05-11  Uroš Bizjak  <ubizjak@gmail.com>
 
        PR target/95046

diff --git a/gcc/testsuite/gfortran.dg/pr95053.f b/gcc/testsuite/gfortran.dg/pr95053.f
new file mode 100644 (file)
index 0000000..1d15c66
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr95053.f
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! PR fortran/95053 - ICE in gfc_divide(): Bad basic type
+!
+ 123  FORMAT ('A'/'B')
+ 132  FORMAT (A/
+     +     ' B')
+      END