aboutsummaryrefslogtreecommitdiff
path: root/gcc/c
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2023-03-28 14:34:49 -0400
committerDavid Malcolm <dmalcolm@redhat.com>2023-03-28 14:34:49 -0400
commit22c3a6c3c118283dfef1b9928dd21110098679b7 (patch)
tree4e0c0bb61d608e1603f1b6fabf4f2460a718a0a2 /gcc/c
parentaf45b17d0a8fe3e7ae08662008a1f41e48a4a3eb (diff)
downloadgcc-22c3a6c3c118283dfef1b9928dd21110098679b7.zip
gcc-22c3a6c3c118283dfef1b9928dd21110098679b7.tar.gz
gcc-22c3a6c3c118283dfef1b9928dd21110098679b7.tar.bz2
Don't emit -Wxor-used-as-pow on macro expansions [PR107002]
PR c/107002 reports an assertion failure from deep inside the diagnostic_shows_locus when attempting to print fix-it hints relating to -Wxor-used-as-pow. The case involves macro expansions with -ftrack-macro-expansion=0. It doesn't seem to make much sense to emit this warning for macro expansions, so this patch updates the warning not to (which seems to also be clang's behavior). The patch also adds some bulletproofing to diagnostic-show-locus.cc to be more robust against such invalid fix-it hints. Doing so fixes the ICE. gcc/c-family/ChangeLog: PR c/107002 * c-common.h (check_for_xor_used_as_pow): Add "rhs_loc" param. * c-warn.cc (check_for_xor_used_as_pow): Add "rhs_loc" param. Reject cases where involving macro expansions. gcc/c/ChangeLog: PR c/107002 * c-typeck.cc (parser_build_binary_op): Update for new param of check_for_xor_used_as_pow. gcc/cp/ChangeLog: PR c/107002 * parser.cc (cp_parser_binary_expression): Update for new param of check_for_xor_used_as_pow. gcc/ChangeLog: PR c/107002 * diagnostic-show-locus.cc (column_range::column_range): Factor out assertion conditional into... (column_range::valid_p): ...this new function. (line_corrections::add_hint): Don't attempt to consolidate hints if it would lead to invalid column_range instances. gcc/testsuite/ChangeLog: PR c/107002 * c-c++-common/Wxor-used-as-pow-1.c: Add macro test. * c-c++-common/Wxor-used-as-pow-pr107002-0.c: New test. * c-c++-common/Wxor-used-as-pow-pr107002-1.c: New test. * c-c++-common/Wxor-used-as-pow-pr107002-2.c: New test. Signed-off-by: David Malcolm <dmalcolm@redhat.com>
Diffstat (limited to 'gcc/c')
-rw-r--r--gcc/c/c-typeck.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc
index 45bacc0..7079d4e 100644
--- a/gcc/c/c-typeck.cc
+++ b/gcc/c/c-typeck.cc
@@ -4083,7 +4083,7 @@ parser_build_binary_op (location_t location, enum tree_code code,
&& arg2.m_decimal)
check_for_xor_used_as_pow (arg1.get_location (), arg1.value,
location,
- arg2.value);
+ arg2.get_location (), arg2.value);
return result;
}