re PR c++/43452 (Array delete causes error on incomplete type)

2013-09-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/43452
	* doc/invoke.texi (-Wdelete-incomplete): Document it.

/c-family
2013-09-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/43452
	* c.opt (Wdelete-incomplete): Add.

/cp
2013-09-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/43452
	* init.c (build_vec_delete_1): When the type is incomplete emit a
	warning, enabled by default (not an error).
	(build_delete): Adjust to use OPT_Wdelete_incomplete.

/testsuite
2013-09-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/43452
	* g++.dg/warn/Wdelete-incomplete-1.C: New.
	* g++.dg/warn/Wdelete-incomplete-2.C: Likewise.
	* g++.dg/init/delete1.C: Adjust.

From-SVN: r202404

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a4b5bc165c2c7d7ecfb329d90469fa7c404befa..03a36575b1754009e624d7cb6f3ad4a6ddf9047c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/43452
+       * doc/invoke.texi (-Wdelete-incomplete): Document it.
+
 2013-09-09  Ian Bolton  <ian.bolton@arm.com>
 
        * config/aarch64/aarch64.c (aarch64_preferred_reload_class): Return
@@ -7,7 +12,8 @@
 
        * config/aarch64/aarch64.c (aarch64_select_cc_mode): Return CC_SWP for
        comparison with negated operand.
-       * config/aarch64/aarch64.md (compare_neg<mode>): Match canonical RTL form.
+       * config/aarch64/aarch64.md (compare_neg<mode>): Match canonical
+       RTL form.
 
 2013-09-09  Richard Biener  <rguenther@suse.de>
 

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 95babfa743f1cb6adc6892a9ac3935714ba284c4..4a93498299aa31723dc8b52d87ccd3138f4c1b3b 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/43452
+       * c.opt (Wdelete-incomplete): Add.
+
 2013-09-08  Joern Rennecke  <joern.rennecke@embecosm.com>
 
        * c-common.c (same_scalar_type_ignoring_signedness): Delete.

diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 9690a087fd3569dc9b134d5cda944c77885bbb45..f390f342c91d420f2cbff7c6da276e481790ab83 100644 (file)
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -339,6 +339,10 @@ Wdeclaration-after-statement
 C ObjC Var(warn_declaration_after_statement) Warning
 Warn when a declaration is found after a statement
 
+Wdelete-incomplete
+C++ ObjC++ Var(warn_delete_incomplete) Init(1) Warning
+Warn when deleting a pointer to incomplete type
+
 Wdelete-non-virtual-dtor
 C++ ObjC++ Var(warn_delnonvdtor) Warning LangEnabledBy(C++ ObjC++,Wall)
 Warn about deleting polymorphic objects with non-virtual destructors

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a8d7be3f910aebba512657f02f237eaabd9bdf43..bc9c49857f2fa4119a48bcf6978065f06237d331 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/43452
+       * init.c (build_vec_delete_1): When the type is incomplete emit a
+       warning, enabled by default (not an error).
+       (build_delete): Adjust to use OPT_Wdelete_incomplete.
+
 2013-09-09  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/58362

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index f261f99b82b5d3a7edaa9b7429f27263d7aaa7ca..df7dc7d3a485985119c299ec72064fab1b4e08eb 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -3078,7 +3078,7 @@ build_vec_delete_1 (tree base, tree maxindex, tree type,
 {
   tree virtual_size;
   tree ptype = build_pointer_type (type = complete_type (type));
-  tree size_exp = size_in_bytes (type);
+  tree size_exp;
 
   /* Temporary variables used by the loop.  */
   tree tbase, tbase_init;
@@ -3106,6 +3106,23 @@ build_vec_delete_1 (tree base, tree maxindex, tree type,
   if (base == error_mark_node || maxindex == error_mark_node)
     return error_mark_node;
 
+  if (!COMPLETE_TYPE_P (type))
+    {
+      if ((complain & tf_warning)
+         && warning (OPT_Wdelete_incomplete,
+                     "possible problem detected in invocation of "
+                     "delete [] operator:"))
+       {
+         cxx_incomplete_type_diagnostic (base, type, DK_WARNING);
+         inform (input_location, "neither the destructor nor the "
+                 "class-specific operator delete [] will be called, "
+                 "even if they are declared when the class is defined");
+       }
+      return build_builtin_delete_call (base);
+    } 
+
+  size_exp = size_in_bytes (type);
+
   if (! MAYBE_CLASS_TYPE_P (type) || TYPE_HAS_TRIVIAL_DESTRUCTOR (type))
     goto no_destructor;
 
@@ -3820,11 +3837,13 @@ build_delete (tree type, tree addr, special_function_kind auto_delete,
          if (!COMPLETE_TYPE_P (type))
            {
              if ((complain & tf_warning)
-                 && warning (0, "possible problem detected in invocation of "
+                 && warning (OPT_Wdelete_incomplete,
+                             "possible problem detected in invocation of "
                              "delete operator:"))
                {
                  cxx_incomplete_type_diagnostic (addr, type, DK_WARNING);
-                 inform (input_location, "neither the destructor nor the class-specific "
+                 inform (input_location,
+                         "neither the destructor nor the class-specific "
                          "operator delete will be called, even if they are "
                          "declared when the class is defined");
                }

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 4995a5d664e67f165a47cec237437db5feccbf98..5b3c078e77bde0aa5275dc11d1d85e0e61d39b0a 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -240,8 +240,8 @@ Objective-C and Objective-C++ Dialects}.
 -Wno-attributes -Wno-builtin-macro-redefined @gol
 -Wc++-compat -Wc++11-compat -Wcast-align  -Wcast-qual  @gol
 -Wchar-subscripts -Wclobbered  -Wcomment -Wconditionally-supported  @gol
--Wconversion  -Wcoverage-mismatch  -Wno-cpp  -Wno-deprecated  @gol
--Wno-deprecated-declarations -Wdisabled-optimization  @gol
+-Wconversion -Wcoverage-mismatch  -Wdelete-incomplete -Wno-cpp  @gol
+-Wno-deprecated -Wno-deprecated-declarations -Wdisabled-optimization  @gol
 -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
 -Wno-endif-labels -Werror  -Werror=* @gol
 -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
@@ -4490,6 +4490,12 @@ types. @option{-Wconversion-null} is enabled by default.
 Warn when a literal '0' is used as null pointer constant.  This can
 be useful to facilitate the conversion to @code{nullptr} in C++11.
 
+@item -Wdelete-incomplete @r{(C++ and Objective-C++ only)}
+@opindex Wdelete-incomplete
+@opindex Wno-delete-incomplete
+Warn when deleting a pointer to incomplete type, which may cause
+undefined behavior at runtime.  This warning is enabled by default.
+
 @item -Wuseless-cast @r{(C++ and Objective-C++ only)}
 @opindex Wuseless-cast
 @opindex Wno-useless-cast

diff --git a/gcc/testsuite/g++.dg/init/delete1.C b/gcc/testsuite/g++.dg/init/delete1.C
index 698b127714a633541d7f5e21cd5b18fc8a4fc188..304dca1caf995a234235abf0ac27b5b683371c12 100644 (file)
--- a/gcc/testsuite/g++.dg/init/delete1.C
+++ b/gcc/testsuite/g++.dg/init/delete1.C
@@ -1,7 +1,7 @@
 // PR c++/19811
 
-class C; // { dg-error "forward" }
+class C; // { dg-warning "forward" }
 
 void foo(void *p) {
-  delete [] ((C*)p) ; // { dg-error "" }
+  delete [] ((C*)p) ; // { dg-warning "problem|incomplete" }
 }

diff --git a/gcc/testsuite/g++.dg/warn/Wdelete-incomplete-1.C b/gcc/testsuite/g++.dg/warn/Wdelete-incomplete-1.C
new file mode 100644 (file)
index 0000000..69689ba
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wdelete-incomplete-1.C
@@ -0,0 +1,7 @@
+// PR c++/43452
+
+class Foo;         // { dg-warning "forward" }
+int main() {
+   Foo* p;         // { dg-warning "incomplete" }
+   delete [] p;    // { dg-warning "problem" }
+}

diff --git a/gcc/testsuite/g++.dg/warn/Wdelete-incomplete-2.C b/gcc/testsuite/g++.dg/warn/Wdelete-incomplete-2.C
new file mode 100644 (file)
index 0000000..6c3aaa7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wdelete-incomplete-2.C
@@ -0,0 +1,8 @@
+// PR c++/43452
+// { dg-options -Wno-delete-incomplete }
+
+class Foo;
+int main() {
+   Foo* p;
+   delete [] p;
+}