]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
fortran: Support clobbering of ASSOCIATE variables [PR41453]
authorMikael Morin <mikael@gcc.gnu.org>
Wed, 31 Aug 2022 09:58:08 +0000 (11:58 +0200)
committerMikael Morin <mikael@gcc.gnu.org>
Sun, 25 Sep 2022 12:44:54 +0000 (14:44 +0200)
This is in spirit a revert of:
r9-3051-gc109362313623d83fe0a5194bceaf994cf0c6ce0

That commit added a condition to avoid generating ICE with clobbers
of ASSOCIATE variables.
The test added at that point continues to pass if we remove that
condition now.

PR fortran/41453
PR fortran/87401

gcc/fortran/ChangeLog:

* trans-expr.cc (gfc_conv_procedure_call): Remove condition
disabling clobber generation for ASSOCIATE variables.

gcc/testsuite/ChangeLog:

* gfortran.dg/intent_optimize_8.f90: New test.

gcc/fortran/trans-expr.cc
gcc/testsuite/gfortran.dg/intent_optimize_8.f90 [new file with mode: 0644]

index 10b493475870d4bbfde3da607bc91487d4db0d23..c2c7382c7d77333400416a43690d235e3814fbb0 100644 (file)
@@ -6527,7 +6527,6 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
                          && !e->symtree->n.sym->attr.dimension
                          && !e->symtree->n.sym->attr.pointer
                          && !e->symtree->n.sym->attr.allocatable
-                         && !e->symtree->n.sym->attr.associate_var
                          && e->ts.type != BT_CHARACTER
                          && e->ts.type != BT_DERIVED
                          && e->ts.type != BT_CLASS
diff --git a/gcc/testsuite/gfortran.dg/intent_optimize_8.f90 b/gcc/testsuite/gfortran.dg/intent_optimize_8.f90
new file mode 100644 (file)
index 0000000..4336fce
--- /dev/null
@@ -0,0 +1,45 @@
+! { dg-do run }
+! { dg-additional-options "-fno-inline -fno-ipa-modref -fdump-tree-optimized -fdump-tree-original" }
+!
+! PR fortran/41453
+! Check that the INTENT(OUT) attribute causes one clobber to be emitted in
+! the caller before each call to FOO in the *.original dump, and the
+! initialization constants to be optimized away in the *.optimized dump,
+! in the case of associate variables.
+
+module x
+implicit none
+contains
+  subroutine foo(a)
+    integer, intent(out) :: a
+    a = 42
+  end subroutine foo
+end module x
+
+program main
+  use x
+  implicit none
+  integer :: c1, c2
+
+  c1 = 123456789
+  associate (d1 => c1)
+    call foo(d1)
+    if (d1 /= 42) stop 1
+  end associate
+  if (c1 /= 42) stop 2
+
+  c2 = 0
+  associate (d2 => c2)
+    d2 = 987654321
+    call foo(d2)
+    if (d2 /= 42) stop 3
+  end associate
+  if (c2 /= 42) stop 4
+
+end program main
+
+! { dg-final { scan-tree-dump-times "CLOBBER" 2 "original" } }
+! { dg-final { scan-tree-dump "d1 = {CLOBBER};" "original" } }
+! { dg-final { scan-tree-dump "\\*d2 = {CLOBBER};" "original" } }
+! { dg-final { scan-tree-dump-not "123456789" "optimized" { target __OPTIMIZE__ } } }
+! { dg-final { scan-tree-dump-not "987654321" "optimized" { target __OPTIMIZE__ } } }