diff options
| author | Martin Uecker <muecker@gwdg.de> | 2020-12-07 23:51:25 +0100 |
|---|---|---|
| committer | Martin Uecker <muecker@gwdg.de> | 2020-12-07 23:57:43 +0100 |
| commit | a19a242c708060e067b4fd5a76995144e6f239d0 (patch) | |
| tree | 2656bc2992da8a4b9aba84a5ea09b35818e51f3b | |
| parent | b737b70fad398728f6006e8397d1bb31ccea4ce7 (diff) | |
| download | gcc-a19a242c708060e067b4fd5a76995144e6f239d0.zip gcc-a19a242c708060e067b4fd5a76995144e6f239d0.tar.gz gcc-a19a242c708060e067b4fd5a76995144e6f239d0.tar.bz2 | |
C: Fix atomic loads. [PR97981]
To handle atomic loads correctly, we need to move the code that
drops qualifiers in lvalue conversion after the code that
handles atomics.
2020-12-07 Martin Uecker <muecker@gwdg.de>
gcc/c/
PR c/97981
* c-typeck.c (convert_lvalue_to_rvalue): Move the code
that drops qualifiers to the end of the function.
gcc/testsuite/
PR c/97981
* gcc.dg/pr97981.c: New test.
* gcc.dg/pr60195.c: Adapt test.
| -rw-r--r-- | gcc/c/c-typeck.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr60195.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr97981.c | 15 |
3 files changed, 19 insertions, 4 deletions
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index cdc491a..138af07 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -2080,9 +2080,6 @@ convert_lvalue_to_rvalue (location_t loc, struct c_expr exp, exp = default_function_array_conversion (loc, exp); if (!VOID_TYPE_P (TREE_TYPE (exp.value))) exp.value = require_complete_type (loc, exp.value); - if (convert_p && !error_operand_p (exp.value) - && (TREE_CODE (TREE_TYPE (exp.value)) != ARRAY_TYPE)) - exp.value = convert (build_qualified_type (TREE_TYPE (exp.value), TYPE_UNQUALIFIED), exp.value); if (really_atomic_lvalue (exp.value)) { vec<tree, va_gc> *params; @@ -2119,6 +2116,9 @@ convert_lvalue_to_rvalue (location_t loc, struct c_expr exp, exp.value = build4 (TARGET_EXPR, nonatomic_type, tmp, func_call, NULL_TREE, NULL_TREE); } + if (convert_p && !error_operand_p (exp.value) + && (TREE_CODE (TREE_TYPE (exp.value)) != ARRAY_TYPE)) + exp.value = convert (build_qualified_type (TREE_TYPE (exp.value), TYPE_UNQUALIFIED), exp.value); return exp; } diff --git a/gcc/testsuite/gcc.dg/pr60195.c b/gcc/testsuite/gcc.dg/pr60195.c index 8eccf7f..0a50a30 100644 --- a/gcc/testsuite/gcc.dg/pr60195.c +++ b/gcc/testsuite/gcc.dg/pr60195.c @@ -15,7 +15,7 @@ atomic_int fn2 (void) { atomic_int y = 0; - y; /* { dg-warning "statement with no effect" } */ + y; return y; } diff --git a/gcc/testsuite/gcc.dg/pr97981.c b/gcc/testsuite/gcc.dg/pr97981.c new file mode 100644 index 0000000..846b875 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr97981.c @@ -0,0 +1,15 @@ +/* PR c/97981 */ +/* { dg-do compile } */ +/* { dg-options "-fdump-tree-original" } */ +/* { dg-final { scan-tree-dump-times "atomic_load" 2 "original" } } */ + + +void f(void) +{ + volatile _Atomic int x; + x; + volatile _Atomic double a; + double b; + b = a; +} + |