re PR fortran/67219 (Incorrect conversion warning)

2016-10-30  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/67219
	* arith.c (gfc_int2real):  Change gfc_warning_now
	to gfc_warning.
	* primary.c (match_complex_constant):  If there
	is no comma, throw away any warning which might have
	been issued by gfc_int2real.

2016-10-30  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/67219
	* gfortran.dg/pr67219.f90:  New test.

From-SVN: r241689

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 684af2f0d2ef2768c3d28abfa255c183452062e9..be4f1b8f03fd028326688d28cd5b4d5acb363507 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2016-10-30  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/67219
+       * arith.c (gfc_int2real):  Change gfc_warning_now
+       to gfc_warning.
+       * primary.c (match_complex_constant):  If there
+       is no comma, throw away any warning which might have
+       been issued by gfc_int2real.
+
 2016-10-28  Steven G. Kargl <kargl@gcc.gnu.org>
 
        PR fortran/71891

diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c
index 8af75400d80db7eef586e1b516fdd0b7b33f21a9..d566faa29cd889870ba02537e0764f7a7a5f6a11 100644 (file)
--- a/gcc/fortran/arith.c
+++ b/gcc/fortran/arith.c
@@ -2072,11 +2072,11 @@ gfc_int2real (gfc_expr *src, int kind)
 
   if (warn_conversion
       && wprecision_int_real (src->value.integer, result->value.real))
-    gfc_warning_now (OPT_Wconversion, "Change of value in conversion "
-                    "from %qs to %qs at %L",
-                    gfc_typename (&src->ts),
-                    gfc_typename (&result->ts),
-                    &src->where);
+    gfc_warning (OPT_Wconversion, "Change of value in conversion "
+                "from %qs to %qs at %L",
+                gfc_typename (&src->ts),
+                gfc_typename (&result->ts),
+                &src->where);
 
   return result;
 }

diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index bcbaeaa63695726cb852348d9d3da1005d5553e1..2101644fcdc2649377b5c70517b6d98bd87b3212 100644 (file)
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -1353,6 +1353,10 @@ match_complex_constant (gfc_expr **result)
 
   if (gfc_match_char (',') == MATCH_NO)
     {
+      /* It is possible that gfc_int2real issued a warning when
+        converting an integer to real.  Throw this away here.  */
+
+      gfc_clear_warning ();
       gfc_pop_error (&old_error);
       m = MATCH_NO;
       goto cleanup;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7ebc61642d2d7828fc8f9e2908029ca5c96f81cd..d65ebb4a8cef3afa8018bdf69703f1d2218d3906 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-30  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/67219
+       * gfortran.dg/pr67219.f90:  New test.
+
 2016-10-29  Jakub Jelinek  <jakub@redhat.com>
 
        PR rtl-optimization/77919

diff --git a/gcc/testsuite/gfortran.dg/pr67219.f90 b/gcc/testsuite/gfortran.dg/pr67219.f90
new file mode 100644 (file)
index 0000000..26d5f3f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr67219.f90
@@ -0,0 +1,8 @@
+! { dg-do compile }
+! PR 67149 - this used to throw a spurious error.
+function foo(bar)
+   integer(8)             :: foo
+   integer(4), intent(in) :: bar
+   integer(4), parameter  :: huge_4 = huge(0_4)
+   foo = (huge_4 - int(bar,kind=8))
+end function