aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2021-08-09 10:19:10 +0200
committerRichard Biener <rguenther@suse.de>2021-08-10 09:27:49 +0200
commitbb169406cdc9e044eaec500dd742c2fed40f5488 (patch)
treef89b60e9073bc859ecfdc044a91bb65cf63bdf49
parent0631faf87a197145acd833249bf8f20a1c4aaabf (diff)
downloadgcc-bb169406cdc9e044eaec500dd742c2fed40f5488.zip
gcc-bb169406cdc9e044eaec500dd742c2fed40f5488.tar.gz
gcc-bb169406cdc9e044eaec500dd742c2fed40f5488.tar.bz2
middle-end/101824 - properly handle volatiles in nested fn lowering
When we build the COMPONENT_REF of a formerly volatile local off the FRAME decl we have to make sure to mark the COMPONENT_REF as TREE_THIS_VOLATILE. While the GIMPLE operand scanner looks at the FIELD_DECL this is not how volatile GENERIC refs work. 2021-08-09 Richard Biener <rguenther@suse.de> PR middle-end/101824 * tree-nested.c (get_frame_field): Mark the COMPONENT_REF as volatile in case the variable was. * gcc.dg/tree-ssa/pr101824.c: New testcase.
-rw-r--r--gcc/testsuite/gcc.dg/tree-ssa/pr101824.c19
-rw-r--r--gcc/tree-nested.c1
2 files changed, 20 insertions, 0 deletions
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr101824.c b/gcc/testsuite/gcc.dg/tree-ssa/pr101824.c
new file mode 100644
index 0000000..d5987e1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr101824.c
@@ -0,0 +1,19 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fdump-tree-pcom-details -fdump-tree-optimized" } */
+
+int main()
+{
+ volatile int y;
+ void bar()
+ {
+ __builtin_printf ("%d", y);
+ }
+ while (y)
+ ;
+ return 0;
+}
+
+/* Make sure the load from y is correctly interpreted as volatile, even
+ when going through FRAME. */
+/* { dg-final { scan-tree-dump-not "Executing predictive commoning" "pcom" } } */
+/* { dg-final { scan-tree-dump " ={v} FRAME" "optimized" } } */
diff --git a/gcc/tree-nested.c b/gcc/tree-nested.c
index 0c3fb02..cc59526 100644
--- a/gcc/tree-nested.c
+++ b/gcc/tree-nested.c
@@ -1033,6 +1033,7 @@ get_frame_field (struct nesting_info *info, tree target_context,
}
x = build3 (COMPONENT_REF, TREE_TYPE (field), x, field, NULL_TREE);
+ TREE_THIS_VOLATILE (x) = TREE_THIS_VOLATILE (field);
return x;
}