aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2017-03-03 09:58:10 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2017-03-03 09:58:10 +0000
commit7278b0a266909c8558e83a4fa91fd0588e92fa1c (patch)
tree62c4a90250b01b8e44129773e8e4494d655f637f /gcc
parent5719c938be12a48749833d6fa29c7a9a7724f37e (diff)
downloadgcc-7278b0a266909c8558e83a4fa91fd0588e92fa1c.zip
gcc-7278b0a266909c8558e83a4fa91fd0588e92fa1c.tar.gz
gcc-7278b0a266909c8558e83a4fa91fd0588e92fa1c.tar.bz2
re PR c++/79791 (-Werror=write-strings ignored with -Wpedantic)
PR c++/79791 * typeck.c (string_conv_p): In C++11, always call pedwarn with OPT_Wwrite_strings. * g++.dg/warn/Wwrite-strings-1.C: New test. * g++.dg/warn/Wwrite-strings-2.C: New test. * g++.dg/warn/Wwrite-strings-3.C: New test. * g++.dg/warn/Wwrite-strings-4.C: New test. * g++.dg/warn/Wwrite-strings-5.C: New test. * g++.dg/warn/Wwrite-strings-6.C: New test. * g++.dg/warn/Wwrite-strings-7.C: New test. * g++.dg/warn/Wwrite-strings-8.C: New test. * g++.dg/warn/Wwrite-strings-9.C: New test. * g++.dg/warn/Wwrite-strings-10.C: New test. * g++.dg/warn/Wwrite-strings-11.C: New test. * g++.dg/warn/Wwrite-strings-12.C: New test. From-SVN: r245864
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/typeck.c3
-rw-r--r--gcc/testsuite/ChangeLog16
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-1.C5
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-10.C5
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-11.C5
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-12.C6
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-2.C5
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-3.C5
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-4.C6
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-5.C6
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-6.C6
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-7.C5
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-8.C5
-rw-r--r--gcc/testsuite/g++.dg/warn/Wwrite-strings-9.C5
15 files changed, 87 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index be98880..7ff2827 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-03 Marek Polacek <polacek@redhat.com>
+
+ PR c++/79791
+ * typeck.c (string_conv_p): In C++11, always call pedwarn with
+ OPT_Wwrite_strings.
+
2017-03-02 Jason Merrill <jason@redhat.com>
Update overload resolution with deduction guides.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 3216bc4..d111124 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -2175,8 +2175,7 @@ string_conv_p (const_tree totype, const_tree exp, int warn)
if (warn)
{
if (cxx_dialect >= cxx11)
- pedwarn (input_location,
- pedantic ? OPT_Wpedantic : OPT_Wwrite_strings,
+ pedwarn (input_location, OPT_Wwrite_strings,
"ISO C++ forbids converting a string constant to %qT",
totype);
else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e5a08ac..502a073 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2017-03-03 Marek Polacek <polacek@redhat.com>
+
+ PR c++/79791
+ * g++.dg/warn/Wwrite-strings-1.C: New test.
+ * g++.dg/warn/Wwrite-strings-2.C: New test.
+ * g++.dg/warn/Wwrite-strings-3.C: New test.
+ * g++.dg/warn/Wwrite-strings-4.C: New test.
+ * g++.dg/warn/Wwrite-strings-5.C: New test.
+ * g++.dg/warn/Wwrite-strings-6.C: New test.
+ * g++.dg/warn/Wwrite-strings-7.C: New test.
+ * g++.dg/warn/Wwrite-strings-8.C: New test.
+ * g++.dg/warn/Wwrite-strings-9.C: New test.
+ * g++.dg/warn/Wwrite-strings-10.C: New test.
+ * g++.dg/warn/Wwrite-strings-11.C: New test.
+ * g++.dg/warn/Wwrite-strings-12.C: New test.
+
2017-03-03 Richard Biener <rguenther@suse.de>
PR middle-end/79818
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-1.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-1.C
new file mode 100644
index 0000000..05abca3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-1.C
@@ -0,0 +1,5 @@
+// PR c++/79791
+// { dg-do compile { target c++11 } }
+// { dg-options "" }
+
+char *s = "foo"; // { dg-warning "ISO C\\+\\+ forbids converting a string constant" }
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-10.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-10.C
new file mode 100644
index 0000000..d34b0b0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-10.C
@@ -0,0 +1,5 @@
+// PR c++/79791
+// { dg-do compile { target { ! c++11 } } }
+// { dg-options "" }
+
+char *s = "foo"; // { dg-warning "deprecated conversion from string constant" }
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-11.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-11.C
new file mode 100644
index 0000000..11ddcdb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-11.C
@@ -0,0 +1,5 @@
+// PR c++/79791
+// { dg-do compile { target { ! c++11 } } }
+// { dg-options "-pedantic-errors" }
+
+char *s = "foo"; // { dg-warning "deprecated conversion from string constant" }
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-12.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-12.C
new file mode 100644
index 0000000..754a9c8
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-12.C
@@ -0,0 +1,6 @@
+// PR c++/79791
+// { dg-do compile { target { ! c++11 } } }
+// { dg-options "-Werror=write-strings" }
+// { dg-message "some warnings being treated as errors" "" { target *-*-* } 0 }
+
+char *s = "foo"; // { dg-error "deprecated conversion from string constant" }
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-2.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-2.C
new file mode 100644
index 0000000..53084d9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-2.C
@@ -0,0 +1,5 @@
+// PR c++/79791
+// { dg-do compile { target c++11 } }
+// { dg-options "-pedantic-errors" }
+
+char *s = "foo"; // { dg-error "ISO C\\+\\+ forbids converting a string constant" }
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-3.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-3.C
new file mode 100644
index 0000000..6cb9654
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-3.C
@@ -0,0 +1,5 @@
+// PR c++/79791
+// { dg-do compile { target c++11 } }
+// { dg-options "-pedantic-errors -Wno-write-strings" }
+
+char *s = "foo";
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-4.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-4.C
new file mode 100644
index 0000000..2654c39
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-4.C
@@ -0,0 +1,6 @@
+// PR c++/79791
+// { dg-do compile { target c++11 } }
+// { dg-options "-Werror=write-strings" }
+// { dg-message "some warnings being treated as errors" "" { target *-*-* } 0 }
+
+char *s = "foo"; // { dg-error "ISO C\\+\\+ forbids converting a string constant" }
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-5.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-5.C
new file mode 100644
index 0000000..f58ea90
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-5.C
@@ -0,0 +1,6 @@
+// PR c++/79791
+// { dg-do compile { target c++11 } }
+// { dg-options "-Werror=write-strings -Wpedantic" }
+// { dg-message "some warnings being treated as errors" "" { target *-*-* } 0 }
+
+char *s = "foo"; // { dg-error "ISO C\\+\\+ forbids converting a string constant" }
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-6.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-6.C
new file mode 100644
index 0000000..ff89f38
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-6.C
@@ -0,0 +1,6 @@
+// PR c++/79791
+// { dg-do compile { target c++11 } }
+// { dg-options "-Werror=write-strings -Wno-pedantic" }
+// { dg-message "some warnings being treated as errors" "" { target *-*-* } 0 }
+
+char *s = "foo"; // { dg-error "ISO C\\+\\+ forbids converting a string constant" }
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-7.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-7.C
new file mode 100644
index 0000000..13a8291
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-7.C
@@ -0,0 +1,5 @@
+// PR c++/79791
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wno-write-strings" }
+
+char *s = "foo";
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-8.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-8.C
new file mode 100644
index 0000000..df5f283
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-8.C
@@ -0,0 +1,5 @@
+// PR c++/79791
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wpedantic -Wno-write-strings" }
+
+char *s = "foo";
diff --git a/gcc/testsuite/g++.dg/warn/Wwrite-strings-9.C b/gcc/testsuite/g++.dg/warn/Wwrite-strings-9.C
new file mode 100644
index 0000000..5db813b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wwrite-strings-9.C
@@ -0,0 +1,5 @@
+// PR c++/79791
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wno-error=write-strings -pedantic-errors" }
+
+char *s = "foo"; // { dg-warning "ISO C\\+\\+ forbids converting a string constant" }
generated by cgit v1.1 at 2025-05-26 01:19:11 +0000