This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Add quotes to error messages related to Sanitizers.
- From: Martin Liška <mliska at suse dot cz>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Jakub Jelinek <jakub at redhat dot com>
- Date: Mon, 10 Jul 2017 11:36:09 +0200
- Subject: [PATCH] Add quotes to error messages related to Sanitizers.
- Authentication-results: sourceware.org; auth=none
Hi.
This adds missing quotes to various error messages related to AddressSanitizer.
Patch can bootstrap on ppc64le-redhat-linux and survives regression tests.
Ready to be installed?
Martin
gcc/ChangeLog:
2017-07-04 Martin Liska <mliska@suse.cz>
* opts.c (finish_options): Add quotes to error messages.
(parse_sanitizer_options): Likewise.
gcc/testsuite/ChangeLog:
2017-07-04 Martin Liska <mliska@suse.cz>
* c-c++-common/ubsan/sanitize-all-1.c: Update scanned pattern.
* c-c++-common/ubsan/sanitize-recover-1.c:Likewise.
* c-c++-common/ubsan/sanitize-recover-2.c:Likewise.
* c-c++-common/ubsan/sanitize-recover-5.c:Likewise.
* c-c++-common/ubsan/sanitize-recover-7.c:Likewise.
* c-c++-common/ubsan/sanitize-recover-8.c:Likewise.
* c-c++-common/ubsan/sanitize-recover-9.c:Likewise.
---
gcc/opts.c | 18 +++++++++---------
gcc/testsuite/c-c++-common/ubsan/sanitize-all-1.c | 2 +-
gcc/testsuite/c-c++-common/ubsan/sanitize-recover-1.c | 2 +-
gcc/testsuite/c-c++-common/ubsan/sanitize-recover-2.c | 2 +-
gcc/testsuite/c-c++-common/ubsan/sanitize-recover-5.c | 2 +-
gcc/testsuite/c-c++-common/ubsan/sanitize-recover-7.c | 2 +-
gcc/testsuite/c-c++-common/ubsan/sanitize-recover-8.c | 2 +-
gcc/testsuite/c-c++-common/ubsan/sanitize-recover-9.c | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/gcc/opts.c b/gcc/opts.c
index c8affa4d704..bdcda799f8c 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -954,26 +954,26 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
if ((opts->x_flag_sanitize & SANITIZE_USER_ADDRESS)
&& (opts->x_flag_sanitize & SANITIZE_KERNEL_ADDRESS))
error_at (loc,
- "-fsanitize=address is incompatible with "
- "-fsanitize=kernel-address");
+ "%<-fsanitize=address%> is incompatible with "
+ "%<-fsanitize=kernel-address%>");
/* And with TSan. */
if ((opts->x_flag_sanitize & SANITIZE_ADDRESS)
&& (opts->x_flag_sanitize & SANITIZE_THREAD))
error_at (loc,
- "-fsanitize=address and -fsanitize=kernel-address "
- "are incompatible with -fsanitize=thread");
+ "%<-fsanitize=address%> and %<-fsanitize=kernel-address%> "
+ "are incompatible with %<-fsanitize=thread%>");
if ((opts->x_flag_sanitize & SANITIZE_LEAK)
&& (opts->x_flag_sanitize & SANITIZE_THREAD))
error_at (loc,
- "-fsanitize=leak is incompatible with -fsanitize=thread");
+ "%<-fsanitize=leak%> is incompatible with %<-fsanitize=thread%>");
/* Check error recovery for -fsanitize-recover option. */
for (int i = 0; sanitizer_opts[i].name != NULL; ++i)
if ((opts->x_flag_sanitize_recover & sanitizer_opts[i].flag)
&& !sanitizer_opts[i].can_recover)
- error_at (loc, "-fsanitize-recover=%s is not supported",
+ error_at (loc, "%<-fsanitize-recover=%s%> is not supported",
sanitizer_opts[i].name);
/* When instrumenting the pointers, we don't want to remove
@@ -999,8 +999,8 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
if (opts->x_flag_stack_reuse != SR_NONE
&& opts_set->x_flag_stack_reuse != SR_NONE)
error_at (loc,
- "-fsanitize-address-use-after-scope requires "
- "-fstack-reuse=none option");
+ "%<-fsanitize-address-use-after-scope%> requires "
+ "%<-fstack-reuse=none%> option");
opts->x_flag_stack_reuse = SR_NONE;
}
@@ -1621,7 +1621,7 @@ parse_sanitizer_options (const char *p, location_t loc, int scode,
if (code == OPT_fsanitize_)
{
if (complain)
- error_at (loc, "-fsanitize=all option is not valid");
+ error_at (loc, "%<-fsanitize=all%> option is not valid");
}
else
flags |= ~(SANITIZE_THREAD | SANITIZE_LEAK
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-all-1.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-all-1.c
index 9ffba50443a..96a8cc576b6 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-all-1.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-all-1.c
@@ -5,4 +5,4 @@
int i;
-/* { dg-error "-fsanitize=all option is not valid" "" { target *-*-* } 0 } */
+/* { dg-error ".-fsanitize=all. option is not valid" "" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-1.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-1.c
index 4d8c27e945a..efa5ad7291f 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-1.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-1.c
@@ -3,4 +3,4 @@
int i;
-/* { dg-error "-fsanitize-recover=unreachable is not supported" "" { target *-*-* } 0 } */
+/* { dg-error ".-fsanitize-recover=unreachable. is not supported" "" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-2.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-2.c
index e9849bd50ab..2b7cbcb6a7f 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-2.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-2.c
@@ -3,4 +3,4 @@
int i;
-/* { dg-error "-fsanitize-recover=return is not supported" "" { target *-*-* } 0 } */
+/* { dg-error ".-fsanitize-recover=return. is not supported" "" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-5.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-5.c
index 9c1ed322d5e..3d2e51ebb91 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-5.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-5.c
@@ -3,4 +3,4 @@
int i;
-/* { dg-error "-fsanitize-recover=unreachable is not supported" "" { target *-*-* } 0 } */
+/* { dg-error ".-fsanitize-recover=unreachable. is not supported" "" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-7.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-7.c
index 26403ce2488..a571f2bcdc1 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-7.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-7.c
@@ -3,4 +3,4 @@
int i;
-/* { dg-error "-fsanitize=address and -fsanitize=kernel-address are incompatible with -fsanitize=thread" "" { target *-*-* } 0 } */
+/* { dg-error ".-fsanitize=address. and .-fsanitize=kernel-address. are incompatible with .-fsanitize=thread." "" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-8.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-8.c
index ecaf0e648af..97f4bf4c465 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-8.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-8.c
@@ -3,4 +3,4 @@
int i;
-/* { dg-error "-fsanitize=leak is incompatible with -fsanitize=thread" "" { target *-*-* } 0 } */
+/* { dg-error ".-fsanitize=leak. is incompatible with .-fsanitize=thread." "" { target *-*-* } 0 } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-9.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-9.c
index ef80ef1e27d..0800ecbe155 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-9.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-recover-9.c
@@ -3,4 +3,4 @@
int i;
-/* { dg-error "-fsanitize-recover=unreachable is not supported" "" { target *-*-* } 0 } */
+/* { dg-error ".-fsanitize-recover=unreachable. is not supported" "" { target *-*-* } 0 } */