https://gcc.gnu.org/g:e88a212e24c9ccac44631bb57cc080f44a7efa51
commit e88a212e24c9ccac44631bb57cc080f44a7efa51
Author: Mikael Morin <mik...@gcc.gnu.org>
Date: Mon Jun 30 14:19:30 2025 +0200
Correction motif dump coarray_lock_7
Diff:
---
gcc/testsuite/gfortran.dg/coarray_lock_7.f90 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
b/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
index 7e78c5c02bc5..5f4c6ea5f6d0 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
@@ -35,12 +35,12 @@ end
! { dg-final { scan-tree-dump-times "_gfortran_caf_lock \\(caf_token.., 0, 0,
0B, 0B, 0B, 0\\);" 1 "original" } }
! { dg-final { scan-tree-dump-times "_gfortran_caf_unlock \\(caf_token.., 0,
0, 0B, 0B, 0\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_lock \\(caf_token..,
.*\\(\\(3 - parm.\\d+.dim\\\[0\\\].lbound\\) \\+ \\(MAX_EXPR
<parm.\\d+.dim\\\[0\\\].ubound - parm.\\d+.dim\\\[0\\\].lbound, -1> \\+ 1\\)
\\* \\(3 - parm.\\d+.dim\\\[1\\\].lbound\\)\\), 0, 0B, &ii, 0B,
0\\);|_gfortran_caf_lock \\(caf_token.1, \\(3 -
parm.\\d+.dim\\\[0\\\].lbound\\) \\+ \\(MAX_EXPR <parm.\\d+.dim\\\[0\\\].ubound
- parm.\\d+.dim\\\[0\\\].lbound, -1> \\+ 1\\) \\* \\(3 -
parm.\\d+.dim\\\[1\\\].lbound\\), 0, 0B, &ii, 0B, 0\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_unlock \\(caf_token..,
.*\\(\\(2 - parm.\\d+.dim\\\[0\\\].lbound\\) \\+ \\(MAX_EXPR
<parm.\\d+.dim\\\[0\\\].ubound - parm.\\d+.dim\\\[0\\\].lbound, -1> \\+ 1\\)
\\* \\(3 - parm.\\d+.dim\\\[1\\\].lbound\\)\\), 0, &ii, 0B,
0\\);|_gfortran_caf_unlock \\(caf_token.., \\(2 -
parm.\\d+.dim\\\[0\\\].lbound\\) \\+ \\(MAX_EXPR <parm.\\d+.dim\\\[0\\\].ubound
- parm.\\d+.dim\\\[0\\\].lbound, -1> \\+ 1\\) \\* \\(3 -
parm.\\d+.dim\\\[1\\\].lbound\\), 0, &ii, 0B, 0\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_lock \(caf_token.., .*\(\(3
- (?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[0\]\.lbound>?\) \+
\(\((?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[0\]\.ubound>? - (?:NON_LVALUE_EXPR
<)?parm.\d+\.dim\[0\]\.lbound>?\) \+ 1\) \* \(3 - (?:NON_LVALUE_EXPR
<)?parm.\d+\.dim\[1\]\.lbound>?\)\), 0, 0B, &ii, 0B, 0\);|_gfortran_caf_lock
\(caf_token.1, \(3 - (?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[0\]\.lbound>?\) \+
\(MAX_EXPR <(?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[0\]\.ubound>? -
(?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[0\]\.lbound>?, -1> \+ 1\) \* \(3 -
(?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[1\]\.lbound>?\), 0, 0B, &ii, 0B, 0\);} 1
"original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_unlock \(caf_token..,
.*\(\(2 - (?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[0\]\.lbound>?\) \+
\(\(parm.\d+\.dim\[0\]\.ubound>? - (?:NON_LVALUE_EXPR
<)?parm.\d+\.dim\[0\]\.lbound>?\) \+ 1\) \* \(3 - (?:NON_LVALUE_EXPR
<)?parm.\d+\.dim\[1\]\.lbound>?\)\), 0, &ii, 0B, 0\);|_gfortran_caf_unlock
\(caf_token.., \(2 - (?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[0\]\.lbound>?\) \+
\(MAX_EXPR <(?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[0\]\.ubound>? -
(?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[0\]\.lbound>?, -1> \\+ 1\\) \\* \\(3 -
(?:NON_LVALUE_EXPR <)?parm.\d+\.dim\[1\]\.lbound>?\), 0, &ii, 0B, 0\);} 1
"original" } }
-! { dg-final { scan-tree-dump-times {_gfortran_caf_lock \((?:NON_LVALUE_EXPR
<)?three.token>?, 0, \(integer\(kind=4\)\) \(5 - three.dim\[0\].lbound\),
&acquired.[0-9]+, 0B, 0B, 0\);|_gfortran_caf_lock \((?:NON_LVALUE_EXPR
<)?three.token>?, 0, 5 - three.dim\[0\].lbound, &acquired.[0-9]+, 0B, 0B, 0\);}
1 "original" } }
-! { dg-final { scan-tree-dump-times {_gfortran_caf_unlock \((?:NON_LVALUE_EXPR
<)?three.token>?, 0, \(integer\(kind=4\)\) \(8 - three.dim\[0\].lbound\), &ii,
0B, 0\);|_gfortran_caf_unlock \((?:NON_LVALUE_EXPR <)?three.token>?, 0, 8 -
three.dim\[0\].lbound, &ii, 0B, 0\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_lock \((?:NON_LVALUE_EXPR
<)?three.token>?, 0, \(integer\(kind=4\)\) \(5 - (?:NON_LVALUE_EXPR
<)?three.dim\[0\].lbound>?\), &acquired.[0-9]+, 0B, 0B, 0\);|_gfortran_caf_lock
\((?:NON_LVALUE_EXPR <)?three.token>?, 0, 5 - (?:NON_LVALUE_EXPR
<)?three.dim\[0\].lbound>?, &acquired.[0-9]+, 0B, 0B, 0\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_unlock \((?:NON_LVALUE_EXPR
<)?three.token>?, 0, \(integer\(kind=4\)\) \(8 - (?:NON_LVALUE_EXPR
<)?three.dim\[0\].lbound>?\), &ii, 0B, 0\);|_gfortran_caf_unlock
\((?:NON_LVALUE_EXPR <)?three.token>?, 0, 8 - (?:NON_LVALUE_EXPR
<)?three.dim\[0\].lbound>?, &ii, 0B, 0\);} 1 "original" } }
-! { dg-final { scan-tree-dump-times {_gfortran_caf_lock \((?:NON_LVALUE_EXPR
<)?four.token>?, .*\(1 - four.dim\[0\].lbound\), \(integer\(kind=4\)\) \(7 -
four.dim\[1\].lbound\), &acquired.[0-9]+, &ii, 0B, 0\);|_gfortran_caf_lock
\((?:NON_LVALUE_EXPR <)?four.token>?, [^\n\r]*1 - four.dim\[0\].lbound\)?, 7 -
four.dim\[1\].lbound, &acquired.[0-9]+, &ii, 0B, 0\);} 1 "original" } }
-! { dg-final { scan-tree-dump-times {_gfortran_caf_unlock \((?:NON_LVALUE_EXPR
<)?four.token>?, .*\(2 - four.dim\[0\].lbound\), \(integer\(kind=4\)\) \(8 -
four.dim\[1\].lbound\), 0B, 0B, 0\);|_gfortran_caf_unlock \((?:NON_LVALUE_EXPR
<)?four.token>?, \[^\n\r]*2 - four.dim\[0\].lbound\)?, 8 -
four.dim\[1\].lbound, 0B, 0B, 0\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_lock \((?:NON_LVALUE_EXPR
<)?four.token>?, .*\(1 - (?:NON_LVALUE_EXPR <)?four.dim\[0\].lbound>?\),
\(integer\(kind=4\)\) \(7 - (?:NON_LVALUE_EXPR <)?four.dim\[1\].lbound>?\),
&acquired.[0-9]+, &ii, 0B, 0\);|_gfortran_caf_lock \((?:NON_LVALUE_EXPR
<)?four.token>?, [^\n\r]*1 - (?:NON_LVALUE_EXPR <)?four.dim\[0\].lbound>?\)?, 7
- (?:NON_LVALUE_EXPR <)?four.dim\[1\].lbound>?, &acquired.[0-9]+, &ii, 0B,
0\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_unlock \((?:NON_LVALUE_EXPR
<)?four.token>?, .*\(2 - (?:NON_LVALUE_EXPR <)?four.dim\[0\].lbound>?\),
\(integer\(kind=4\)\) \(8 - (?:NON_LVALUE_EXPR <)?four.dim\[1\].lbound>?\), 0B,
0B, 0\);|_gfortran_caf_unlock \((?:NON_LVALUE_EXPR <)?four.token>?, \[^\n\r]*2
- (?:NON_LVALUE_EXPR <)?four.dim\[0\].lbound>?\)?, 8 - four.dim\[1\].lbound,
0B, 0B, 0\);} 1 "original" } }
