https://gcc.gnu.org/g:ca6e017e09d0a52c7f80279668dbf9bedc5b6eec
commit ca6e017e09d0a52c7f80279668dbf9bedc5b6eec
Author: Mikael Morin <mik...@gcc.gnu.org>
Date: Fri Mar 14 16:27:05 2025 +0100
Mises à jour dumps
Mise à jour dump bind-c-contiguous-2.f90
Mise à jour dumps coarray_poly_*.f90
Mise à jour dump coarray_lock_7.f90
Correction dump coarray_allocate_7.f08
Mise à jour dump coarray_lib_alloc_4.f90
Mise à jour dump coarray_lib_alloc_2.f90
Mise à jour dump coarray_lib_alloc_3.f90
Mise à jour dump coarray_lib_alloc_1.f90
Mise à jour dump coarray_lib_token_4.f90
Mise à jour dump coarray_lib_token_3.f90
Mise à jour dump coarray_lib_token_2.f90
Mise à jour dump contiguous_3.f90
Diff:
---
gcc/testsuite/gfortran.dg/bind-c-contiguous-2.f90 | 12 ++++++------
gcc/testsuite/gfortran.dg/coarray_allocate_7.f08 | 2 +-
gcc/testsuite/gfortran.dg/coarray_lib_alloc_1.f90 | 12 ++++++------
gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90 | 12 ++++++------
gcc/testsuite/gfortran.dg/coarray_lib_alloc_3.f90 | 12 ++++++------
gcc/testsuite/gfortran.dg/coarray_lib_alloc_4.f90 | 6 +++---
gcc/testsuite/gfortran.dg/coarray_lib_token_2.f90 | 4 ++--
gcc/testsuite/gfortran.dg/coarray_lib_token_3.f90 | 4 ++--
gcc/testsuite/gfortran.dg/coarray_lib_token_4.f90 | 6 +++---
gcc/testsuite/gfortran.dg/coarray_lock_7.f90 | 12 ++++++------
gcc/testsuite/gfortran.dg/coarray_poly_4.f90 | 2 +-
gcc/testsuite/gfortran.dg/coarray_poly_5.f90 | 2 +-
gcc/testsuite/gfortran.dg/coarray_poly_6.f90 | 2 +-
gcc/testsuite/gfortran.dg/coarray_poly_7.f90 | 2 +-
gcc/testsuite/gfortran.dg/coarray_poly_8.f90 | 2 +-
gcc/testsuite/gfortran.dg/contiguous_3.f90 | 4 ++--
16 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/gcc/testsuite/gfortran.dg/bind-c-contiguous-2.f90
b/gcc/testsuite/gfortran.dg/bind-c-contiguous-2.f90
index 5b546800e7ff..243c4a57cba4 100644
--- a/gcc/testsuite/gfortran.dg/bind-c-contiguous-2.f90
+++ b/gcc/testsuite/gfortran.dg/bind-c-contiguous-2.f90
@@ -60,12 +60,12 @@ end
! Copy in + out
-! { dg-final { scan-tree-dump-times "__builtin_memcpy \\(\\(void \\*\\)
xx->data \\+ xx->dtype.elem_len \\* arrayidx.\[0-9\]+, _xx->base_addr \\+
shift.\[0-9\]+, xx->dtype.elem_len\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {__builtin_memcpy \(\(void \*\) xx->data
\+ xx->dtype.elem_len \* arrayidx.[0-9]+, _xx->base_addr \+ shift.[0-9]+,
(?:NON_LVALUE_EXPR <)?xx->dtype.elem_len>?\);} 1 "original" } }
! { dg-final { scan-tree-dump-times "xx->data = \\(void \\* restrict\\)
_xx->base_addr;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "__builtin_memcpy \\(\\(void \\*\\)
xx->data \\+ xx->dtype.elem_len \\* arrayidx.\[0-9\]+, _xx->base_addr \\+
shift.\[0-9\]+, xx->dtype.elem_len\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "__builtin_memcpy \\(\\(void \\*\\)
yy->data \\+ yy->dtype.elem_len \\* arrayidx.\[0-9\]+, _yy->base_addr \\+
shift.\[0-9\]+, yy->dtype.elem_len\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {__builtin_memcpy \(\(void \*\) xx->data
\+ xx->dtype.elem_len \* arrayidx.[0-9]+, _xx->base_addr \+ shift.[0-9]+,
(?:NON_LVALUE_EXPR <)?xx->dtype.elem_len>?\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {__builtin_memcpy \(\(void \*\) yy->data
\+ yy->dtype.elem_len \* arrayidx.[0-9]+, _yy->base_addr \+ shift.[0-9]+,
(?:NON_LVALUE_EXPR <)?yy->dtype.elem_len>?\);} 1 "original" } }
! { dg-final { scan-tree-dump-times "yy->data = \\(void \\* restrict\\)
_yy->base_addr;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "__builtin_memcpy \\(_yy->base_addr \\+
shift.\[0-9\]+, \\(void \\*\\) yy->data \\+ yy->dtype.elem_len \\*
arrayidx.\[0-9\]+, yy->dtype.elem_len\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {__builtin_memcpy \(_yy->base_addr \+
shift.[0-9]+, \(void \*\) yy->data \+ yy->dtype.elem_len \* arrayidx.[0-9]+,
(?:NON_LVALUE_EXPR <)?yy->dtype.elem_len>?\);} 1 "original" } }
! { dg-final { scan-tree-dump-times "zz =
\\(character\\(kind=1\\)\\\[0:\\\]\\\[1:zz.\[0-9\]+\\\] \\* restrict\\)
_zz->base_addr;" 1 "original" } }
! { dg-final { scan-tree-dump-times "__builtin_memcpy \\(\\(void \\*\\) zz \\+
_zz->elem_len \\* arrayidx.\[0-9\]+, _zz->base_addr \\+ shift.\[0-9\]+,
_zz->elem_len\\);" 1 "original" } }
@@ -73,10 +73,10 @@ end
! Copy in only
-! { dg-final { scan-tree-dump-times "__builtin_memcpy \\(\\(void \\*\\)
aa->data \\+ aa->dtype.elem_len \\* arrayidx.\[0-9\]+, _aa->base_addr \\+
shift.\[0-9\]+, aa->dtype.elem_len\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {__builtin_memcpy \(\(void \*\) aa->data
\+ aa->dtype.elem_len \* arrayidx.[0-9]+, _aa->base_addr \+ shift.[0-9]+,
(?:NON_LVALUE_EXPR <)?aa->dtype.elem_len>?\);} 1 "original" } }
! { dg-final { scan-tree-dump-times "aa->data = \\(void \\* restrict\\)
_aa->base_addr;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "__builtin_memcpy \\(\\(void \\*\\)
bb->data \\+ bb->dtype.elem_len \\* arrayidx.\[0-9\]+, _bb->base_addr \\+
shift.\[0-9\]+, bb->dtype.elem_len\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {__builtin_memcpy \(\(void \*\) bb->data
\+ bb->dtype.elem_len \* arrayidx.[0-9]+, _bb->base_addr \+ shift.[0-9]+,
(?:NON_LVALUE_EXPR <)?bb->dtype.elem_len>?\);} 1 "original" } }
! { dg-final { scan-tree-dump-times "bb->data = \\(void \\* restrict\\)
_bb->base_addr;" 1 "original" } }
! { dg-final { scan-tree-dump-times "cc =
\\(character\\(kind=1\\)\\\[0:\\\]\\\[1:cc.\[0-9\]+\\\] \\* restrict\\)
_cc->base_addr;" 1 "original" } }
! { dg-final { scan-tree-dump-times "__builtin_memcpy \\(\\(void \\*\\) cc \\+
_cc->elem_len \\* arrayidx.\[0-9\]+, _cc->base_addr \\+ shift.\[0-9\]+,
_cc->elem_len\\);" 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_allocate_7.f08
b/gcc/testsuite/gfortran.dg/coarray_allocate_7.f08
index 56160e29d9f4..ab363588b7bc 100644
--- a/gcc/testsuite/gfortran.dg/coarray_allocate_7.f08
+++ b/gcc/testsuite/gfortran.dg/coarray_allocate_7.f08
@@ -23,5 +23,5 @@ program main
if ( object%indices(1) /= 1 ) STOP 2
end program
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(0, 7, \\(void
\\*\\) &mytype\\.\[0-9\]+\\.indices\\.token, &mytype\\.\[0-9\]+\\.indices, 0B,
0B, 0\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(0, 7, \(void
\*\) &(?:NON_LVALUE_EXPR <)?mytype\.[0-9]+\.indices\.token>?,
&mytype\.[0-9]+\.indices, 0B, 0B, 0\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_1.f90
b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_1.f90
index 4f90bdfbdaa5..e3846599fc8f 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_1.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_1.f90
@@ -13,9 +13,9 @@
deallocate(xx,yy,stat=stat, errmsg=errmsg)
end
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(4, 1,
&xx.token, \\(void \\*\\) &xx, &stat.., &errmsg, 200\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(8, 1,
&yy.token, \\(void \\*\\) &yy, &stat.., &errmsg, 200\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&xx.token, 0,
&stat.., &errmsg, 200.;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy.token, 0,
&stat.., &errmsg, 200.;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy.token, 0,
0B, 0B, 0.;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&xx.token, 0,
0B, 0B, 0.;" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(4, 1,
&(?:NON_LVALUE_EXPR <)?xx\.token>?, \(void \*\) &xx, &stat.., &errmsg, 200\);}
1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(8, 1,
&(?:NON_LVALUE_EXPR <)?yy\.token>?, \(void \*\) &yy, &stat.., &errmsg, 200\);}
1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?xx\.token>?, 0, &stat.., &errmsg, 200\);} 1 "original"
} }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?yy\.token>?, 0, &stat.., &errmsg, 200\);} 1 "original"
} }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?yy\.token>?, 0, 0B, 0B, 0\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?xx\.token>?, 0, 0B, 0B, 0\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90
b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90
index 90998ee39aa0..995a0b6d05d7 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90
@@ -15,9 +15,9 @@
deallocate(xx,yy,stat=stat, errmsg=errmsg)
end
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(1, 1,
&xx._data.token, \\(void \\*\\) &xx._data, &stat.., &errmsg, 200\\);" 1
"original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(1, 1,
&yy._data.token, \\(void \\*\\) &yy._data, &stat.., &errmsg, 200\\);" 1
"original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister
.&xx._data.token, 0, &stat.., &errmsg, 200.;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister
.&yy._data.token, 0, &stat.., &errmsg, 200.;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister
.&yy._data.token, 0, 0B, 0B, 0.;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister
.&xx._data.token, 0, 0B, 0B, 0.;" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(1, 1,
&(?:NON_LVALUE_EXPR <)?xx\._data\.token>?, \(void \*\) &xx._data, &stat..,
&errmsg, 200\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(1, 1,
&(?:NON_LVALUE_EXPR <)?yy\._data\.token>?, \(void \*\) &yy._data, &stat..,
&errmsg, 200\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?xx\._data\.token>?, 0, &stat.., &errmsg, 200\);} 1
"original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?yy\._data\.token>?, 0, &stat.., &errmsg, 200\);} 1
"original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?yy\._data\.token>?, 0, 0B, 0B, 0\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?xx\._data\.token>?, 0, 0B, 0B, 0\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_3.f90
b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_3.f90
index 17f800ffe700..ad4ce887c944 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_3.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_3.f90
@@ -16,9 +16,9 @@ subroutine test
deallocate(xx,yy,stat=stat, errmsg=errmsg)
end
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(1, 1,
&xx._data.token, \\(void \\*\\) &xx._data, &stat.., &errmsg, 200\\);" 1
"original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(1, 1,
&yy._data.token, \\(void \\*\\) &yy._data, &stat.., &errmsg, 200\\);" 1
"original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister
.&xx._data.token, 0, &stat.., &errmsg, 200.;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister
.&yy._data.token, 0, &stat.., &errmsg, 200.;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister
.&yy._data.token, 0, 0B, 0B, 0.;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister
.&xx._data.token, 0, 0B, 0B, 0.;" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(1, 1,
&(?:NON_LVALUE_EXPR <)?xx\._data\.token>?, \(void \*\) &xx\._data, &stat..,
&errmsg, 200\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(1, 1,
&(?:NON_LVALUE_EXPR <)?yy\._data\.token>?, \(void \*\) &yy\._data, &stat..,
&errmsg, 200\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?xx\._data\.token>?, 0, &stat.., &errmsg, 200\);} 1
"original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?yy\._data\.token>?, 0, &stat.., &errmsg, 200\);} 1
"original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?yy\._data\.token>?, 0, 0B, 0B, 0\);} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?xx\._data\.token>?, 0, 0B, 0B, 0\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_4.f90
b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_4.f90
index e79ee442be82..5f9e1d4bbfe4 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_4.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_4.f90
@@ -39,9 +39,9 @@ program test_caf_alloc
end
! { dg-final { scan-tree-dump-times "_gfortran_caf_is_present_on_remote" 10
"original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(\[0-9\]+, 1,
&xx\\.token, \\(void \\*\\) &xx, 0B, 0B, 0\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \([0-9]+, 1,
&(?:NON_LVALUE_EXPR <)?xx\.token>?, \(void \*\) &xx, 0B, 0B, 0\)} 1 "original"
} }
! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(\[0-9\]+, 7" 2
"original" } }
! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(\[0-9\]+, 8" 2
"original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister \\(&xx\\.token,
0, 0B, 0B, 0\\)" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister \\(&\\(\\(struct
t \\* restrict\\) xx\\.data\\)->r\\.token, 1, 0B, 0B, 0\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?xx\.token>?, 0, 0B, 0B, 0\)} 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_deregister
\(&(?:NON_LVALUE_EXPR <)?\(\(struct t \* restrict\) xx\.data\)->r\.token>?, 1,
0B, 0B, 0\)} 1 "original" } }
! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister \\(&\\(\\(struct
t \\* restrict\\) xx\\.data\\)->_caf_i, 1, 0B, 0B, 0\\)" 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_token_2.f90
b/gcc/testsuite/gfortran.dg/coarray_lib_token_2.f90
index 6aecc34b6656..891fabaae5c8 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_token_2.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_token_2.f90
@@ -96,7 +96,7 @@ end program main
! sub ((integer(kind=4) *) caf.data, &((struct t * restrict) caf_dt.data)->b,
! caf.token, 0, caf_dt.token, 4);
!
-! { dg-final { scan-tree-dump-times "sub \\(\[^,\]*caf.data,
&\[^,\]*caf_dt.data.->b, caf.token, 0, caf_dt.token, 4\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times {sub \(\([^,]+ \*\) caf\.data,
&\(\([^)]+\) caf_dt\.data\)->b, (?:NON_LVALUE_EXPR <)?caf\.token>?, 0,
(?:NON_LVALUE_EXPR <)?caf_dt\.token>?, 4\)} 1 "original" } }
!
! sub2 ((integer(kind=4) *) x1, (integer(kind=4) *) x2,
! caf_token.4, NON_LVALUE_EXPR <caf_offset.5>,
@@ -110,5 +110,5 @@ end program main
!
! CALL 4
!
-! { dg-final { scan-tree-dump-times "sub_opt \\(.integer.kind=4. .. caf.data,
caf.token, 0\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times {sub_opt \(\(integer\(kind=4\) \*\)
caf\.data, (?:NON_LVALUE_EXPR <)?caf\.token>?, 0\)} 1 "original" } }
!
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_token_3.f90
b/gcc/testsuite/gfortran.dg/coarray_lib_token_3.f90
index bedb0919d006..c1f00731def4 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_token_3.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_token_3.f90
@@ -8,5 +8,5 @@ allocate(CAF(1)[*])
allocate(CAF_SCALAR[*])
end
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(4, 1,
&caf.token, \\(void \\*\\) &caf, 0B, 0B, 0\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(4, 1,
&caf_scalar.token, \\(void \\*\\) &caf_scalar, 0B, 0B, 0\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(4, 1,
&(?:NON_LVALUE_EXPR <)?caf\.token>?, \(void \*\) &caf, 0B, 0B, 0\);} 1
"original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(4, 1,
&(?:NON_LVALUE_EXPR <)?caf_scalar\.token>?, \(void \*\) &caf_scalar, 0B, 0B,
0\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_token_4.f90
b/gcc/testsuite/gfortran.dg/coarray_lib_token_4.f90
index b69aa5fce89a..fe500684fb5d 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_token_4.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_token_4.f90
@@ -43,9 +43,9 @@ end program test_caf
!
! { dg-final { scan-tree-dump-times "expl \\(\\(integer\\(kind=4\\).0:. .\\)
parm.\[0-9\]+.data, caf_token.\[0-9\]+, \\(\\(integer\\(kind=.\\)\\)
parm.\[0-9\]+.data - \\(\\(integer\\(kind=.\\)\\) y.\[0-9\]+\\) \\+
caf_offset.\[0-9\]+\\);" 0 "original" } }
!
-! { dg-final { scan-tree-dump-times "foo \\(&a, &a, &C.\[0-9\]+, a.token, 0,
a.token, 0\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {foo \(&a, &a, &C.[0-9]+,
(?:NON_LVALUE_EXPR <)?a\.token>?, 0, (?:NON_LVALUE_EXPR <)?a.token>?, 0\);} 1
"original" } }
!
-! { dg-final { scan-tree-dump-times "foo \\(&parm.\[0-9\]+, &parm.\[0-9\]+,
&C.\[0-9\]+, a.token, \\(integer\\(kind=.\\)\\) parm.\[0-9\]+.data -
\\(integer\\(kind=.\\)\\) a.data, caf_token.\[0-9\]+, \\(integer\\(kind=.\\)\\)
parm.\[0-9\]+.data - \\(integer\\(kind=.\\)\\) b\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {foo \(&parm.[0-9]+, &parm.[0-9]+,
&C.[0-9]+, (?:NON_LVALUE_EXPR <)?a\.token>?, \(integer\(kind=.\)\)
parm.[0-9]+\.data - \(integer\(kind=.\)\) a\.data, caf_token.[0-9]+,
\(integer\(kind=.\)\) parm.[0-9]+\.data - \(integer\(kind=.\)\) b\);} 1
"original" } }
!
-! { dg-final { scan-tree-dump-times "foo \\(&parm.\[0-9\]+, &a, &C.\[0-9\]+,
caf_token.\[0-9\]+, \\(integer\\(kind=.\\)\\) parm.\[0-9\]+.data -
\\(integer\\(kind=.\\)\\) b, a.token, 0\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {foo \(&parm.[0-9]+, &a, &C.[0-9]+,
caf_token.[0-9]+, \(integer\(kind=.\)\) parm.[0-9]+\.data -
\(integer\(kind=.\)\) b, (?:NON_LVALUE_EXPR <)?a\.token>?, 0\);} 1 "original" }
}
!
diff --git a/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
b/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
index 4f4bdde856d9..7e78c5c02bc5 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
@@ -29,8 +29,8 @@ end
! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(1, 2, \\(void
\\* \\*\\) &caf_token.., \\(void \\*\\) &desc.., 0B, 0B, 0\\);" 1 "original" } }
! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(25, 2, \\(void
\\* \\*\\) &caf_token.., \\(void \\*\\) &desc.., 0B, 0B, 0\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(1, 3,
&three.token, \\(void \\*\\) &three, &stat.., 0B, 0\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(7, 3,
&four.token, \\(void \\*\\) &four, &stat.., 0B, 0\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(1, 3,
&(?:NON_LVALUE_EXPR <)?three.token>?, \(void \*\) &three, &stat.., 0B, 0\);} 1
"original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(7, 3,
&(?:NON_LVALUE_EXPR <)?four.token>?, \(void \*\) &four, &stat.., 0B, 0\);} 1
"original" } }
! { 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" } }
@@ -38,9 +38,9 @@ end
! { 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 \\(three.token, 0,
\\(integer\\(kind=4\\)\\) \\(5 - three.dim\\\[0\\\].lbound\\),
&acquired.\[0-9\]+, 0B, 0B, 0\\);|_gfortran_caf_lock \\(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 \\(three.token, 0,
\\(integer\\(kind=4\\)\\) \\(8 - three.dim\\\[0\\\].lbound\\), &ii, 0B,
0\\);|_gfortran_caf_unlock \\(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 - 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 \\(four.token, .*\\(1
- four.dim\\\[0\\\].lbound\\), \\(integer\\(kind=4\\)\\) \\(7 -
four.dim\\\[1\\\].lbound\\), &acquired.\[0-9\]+, &ii, 0B,
0\\);|_gfortran_caf_lock \\(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 \\(four.token,
.*\\(2 - four.dim\\\[0\\\].lbound\\), \\(integer\\(kind=4\\)\\) \\(8 -
four.dim\\\[1\\\].lbound\\), 0B, 0B, 0\\);|_gfortran_caf_unlock \\(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 - 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" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_4.f90
b/gcc/testsuite/gfortran.dg/coarray_poly_4.f90
index ff574c1ef650..22bd1c578a38 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_4.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_4.f90
@@ -19,4 +19,4 @@ allocate(var%x[*])
call sub(var%x)
end subroutine test
-! { dg-final { scan-tree-dump-times "sub \\(\\(real\\(kind=4\\) \\*\\)
var.x.data, var.x.token, 0\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {sub \(\(real\(kind=4\) \*\) var.x.data,
(?:NON_LVALUE_EXPR <)?var.x.token>?, 0\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_5.f90
b/gcc/testsuite/gfortran.dg/coarray_poly_5.f90
index 8e6142f935df..8c303f0beed6 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_5.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_5.f90
@@ -10,4 +10,4 @@ class(t) :: x
allocate(x%x[*])
end subroutine test
-! { dg-final { scan-tree-dump-times "_gfortran_caf_register \\(4, 1,
&x->_data->x.token, \\(void \\*\\) &x->_data->x, 0B, 0B, 0\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {_gfortran_caf_register \(4, 1,
&(?:NON_LVALUE_EXPR <)?x->_data->x.token>?, \(void \*\) &x->_data->x, 0B, 0B,
0\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_6.f90
b/gcc/testsuite/gfortran.dg/coarray_poly_6.f90
index 344e12b4eff7..f2f084b9038c 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_6.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_6.f90
@@ -18,4 +18,4 @@ end
! { dg-final { scan-tree-dump-times "foo \\(struct __class_MAIN___T_0_1t &
restrict x, void \\* restrict caf_token.., integer\\(kind=\[48\]\\)
caf_offset..\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "bar \\(struct __class_MAIN___T_0_1t \\*
restrict x, void \\* restrict caf_token.., integer\\(kind=\[48\]\\)
caf_offset..\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "bar \\(0B, 0B, 0\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "foo \\(&class.., y._data.token,
\\(integer\\(kind=\[48\]\\)\\) class..._data.data -
\\(integer\\(kind=\[48\]\\)\\) y._data.data\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {foo \(&class.., (?:NON_LVALUE_EXPR
<)?y._data.token>?, \(integer\(kind=[48]\)\) class..._data.data -
\(integer\(kind=[48]\)\) y._data.data\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_7.f90
b/gcc/testsuite/gfortran.dg/coarray_poly_7.f90
index 21a3054f59c9..66fad278953f 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_7.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_7.f90
@@ -18,4 +18,4 @@ end
! { dg-final { scan-tree-dump-times "foo \\(struct __class_MAIN___T_1_1t &
restrict x, void \\* restrict caf_token.., integer\\(kind=\[48\]\\)
caf_offset..\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "bar \\(struct __class_MAIN___T_1_1t \\*
restrict x, void \\* restrict caf_token.., integer\\(kind=\[48\]\\)
caf_offset..\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "bar \\(0B, 0B, 0\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "foo \\(&class.\[0-9\]+, y._data.token,
\\(integer\\(kind=\[48\]\\)\\) class.\[0-9\]+._data.data -
\\(integer\\(kind=\[48\]\\)\\) y._data.data\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {foo \(&class.[0-9]+, (?:NON_LVALUE_EXPR
<)?y._data.token>?, \(integer\(kind=[48]\)\) class.[0-9]+._data.data -
\(integer\(kind=[48]\)\) y._data.data\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_8.f90
b/gcc/testsuite/gfortran.dg/coarray_poly_8.f90
index 9ceece419aeb..c91801aaada7 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_8.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_8.f90
@@ -18,4 +18,4 @@ end
! { dg-final { scan-tree-dump-times "foo \\(struct __class_MAIN___T_1_1t &
restrict x, void \\* restrict caf_token.., integer\\(kind=\[48\]\\)
caf_offset..\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "bar \\(struct __class_MAIN___T_1_1t \\*
restrict x, void \\* restrict caf_token.., integer\\(kind=\[48\]\\)
caf_offset..\\)" 1 "original" } }
! { dg-final { scan-tree-dump-times "bar \\(0B, 0B, 0\\);" 1 "original" } }
-! { dg-final { scan-tree-dump-times "foo \\(&class.\[0-9\]+, y._data.token,
\\(integer\\(kind=\[48\]\\)\\) class.\[0-9\]+._data.data -
\\(integer\\(kind=\[48\]\\)\\) y._data.data\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times {foo \\(&class.[0-9]+, (?:NON_LVALUE_EXPR
<)y._data.token>?, \(integer\(kind=[48]\)\) class.[0-9]+._data.data -
\(integer\(kind=[48]\)\) y._data.data\);} 1 "original" } }
diff --git a/gcc/testsuite/gfortran.dg/contiguous_3.f90
b/gcc/testsuite/gfortran.dg/contiguous_3.f90
index ba0ccce8f9ee..05bd785be464 100644
--- a/gcc/testsuite/gfortran.dg/contiguous_3.f90
+++ b/gcc/testsuite/gfortran.dg/contiguous_3.f90
@@ -35,8 +35,8 @@ end subroutine t2
! { dg-final { scan-tree-dump-times "= a1->dim.0..stride;" 0 "original" } }
! { dg-final { scan-tree-dump-times "= b1->dim.0..stride;" 0 "original" } }
-! { dg-final { scan-tree-dump-times "= c2->dim.0..stride;" 1 "original" } }
-! { dg-final { scan-tree-dump-times "= d2->dim.0..stride;" 1 "original" } }
+! { dg-final { scan-tree-dump-times {= (?:NON_LVALUE_EXPR
<)?c2->dim\[0\]\.stride>?;} 1 "original" } }
+! { dg-final { scan-tree-dump-times {= (?:NON_LVALUE_EXPR
<)?d2->dim\[0\]\.stride>?;} 1 "original" } }
subroutine test3()
