aboutsummaryrefslogtreecommitdiff
path: root/gcc/builtins.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2020-03-17 10:42:35 +0100
committerJakub Jelinek <jakub@redhat.com>2020-03-17 10:42:35 +0100
commit7afa3b82918a75a486aad7818f11df9ea7504368 (patch)
treec826ddf160eac420bd7deb758f19ad5437a8928c /gcc/builtins.c
parentecf2b69a629d4f79efe3c103fe54040437ea18a6 (diff)
downloadgcc-7afa3b82918a75a486aad7818f11df9ea7504368.zip
gcc-7afa3b82918a75a486aad7818f11df9ea7504368.tar.gz
gcc-7afa3b82918a75a486aad7818f11df9ea7504368.tar.bz2
expand: Don't depend on warning flags in code generation of strnlen [PR94189]
The following testcase FAILs with -O2 -fcompare-debug, but the reason isn't that we'd emit different code based on -g or non-debug, but rather that we emit different code depending on whether -w is used or not (or e.g. -Wno-stringop-overflow or whether some other pass emitted some other warning already on the call). Code generation shouldn't depend on whether we emit a warning or not if at all possible. The following patch punts (i.e. doesn't optimize the strnlen call to a constant value) if we would emit the warning if it was enabled. In the PR there is an alternate patch which does optimize the strnlen call no matter if we emit the warning or not, though I think I prefer the version below, e.g. the strnlen call might be crossing field boundaries, which is in strict reading undefined, but I'd be afraid people do that in the real world programs. 2020-03-17 Jakub Jelinek <jakub@redhat.com> PR middle-end/94189 * builtins.c (expand_builtin_strnlen): Do return NULL_RTX if we would emit a warning if it was enabled and don't depend on TREE_NO_WARNING for code-generation. * gcc.dg/pr94189.c: New test.
Diffstat (limited to 'gcc/builtins.c')
-rw-r--r--gcc/builtins.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/gcc/builtins.c b/gcc/builtins.c
index e4a8694..53bae59 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3142,27 +3142,25 @@ expand_builtin_strnlen (tree exp, rtx target, machine_mode target_mode)
return NULL_RTX;
}
- if (lendata.decl
- && !TREE_NO_WARNING (exp)
- && ((tree_int_cst_lt (len, bound))
- || !exact))
+ if (lendata.decl && (tree_int_cst_lt (len, bound) || !exact))
{
location_t warnloc
= expansion_point_location_if_in_system_header (loc);
- if (warning_at (warnloc, OPT_Wstringop_overflow_,
- exact
- ? G_("%K%qD specified bound %E exceeds the size %E "
- "of unterminated array")
- : G_("%K%qD specified bound %E may exceed the size "
- "of at most %E of unterminated array"),
- exp, func, bound, len))
+ if (!TREE_NO_WARNING (exp)
+ && warning_at (warnloc, OPT_Wstringop_overflow_,
+ exact
+ ? G_("%K%qD specified bound %E exceeds the size "
+ "%E of unterminated array")
+ : G_("%K%qD specified bound %E may exceed the "
+ "size of at most %E of unterminated array"),
+ exp, func, bound, len))
{
inform (DECL_SOURCE_LOCATION (lendata.decl),
"referenced argument declared here");
TREE_NO_WARNING (exp) = true;
- return NULL_RTX;
}
+ return NULL_RTX;
}
if (!len)