re PR c++/22508 (ICE after invalid operator new)

	PR c++/22508
	* init.c (build_new_1): Check for empty candidate list.

	* g++.dg/init/new13.C: New test.

From-SVN: r102863

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6220be681e615eb45ff181ea397ec95d3527eead..f8ca474e437ef2ef0670e24143afcb842d5e2488 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-08  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+       PR c++/22508
+       * init.c (build_new_1): Check for empty candidate list.
+
 2005-08-06  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        PR c++/23191

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 9383e928fa51c81b608f5ca1a5ac40a9a7adf75f..a2fcc1ffe60373d5d4a5bbf916308296663b1821 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1918,6 +1918,11 @@ build_new_1 (tree exp)
          args = tree_cons (NULL_TREE, size, placement);
          /* Do name-lookup to find the appropriate operator.  */
          fns = lookup_fnfields (elt_type, fnname, /*protect=*/2);
+         if (fns == NULL_TREE)
+           {
+             error ("no suitable %qD found in class %qT", fnname, elt_type);
+             return error_mark_node;
+           }
          if (TREE_CODE (fns) == TREE_LIST)
            {
              error ("request for member %qD is ambiguous", fnname);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 77cf6334b684150c1dcaad2f203c99b05a0d7aa5..4a79bf8261e33fdd9c272459a5c01f20c767de94 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-08  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+       PR c++/22508
+       * g++.dg/init/new13.C: New test.
+
 2005-08-08  Nathan Sidwell  <nathan@codesourcery.com>
 
        PR c++/21166

diff --git a/gcc/testsuite/g++.dg/init/new13.C b/gcc/testsuite/g++.dg/init/new13.C
new file mode 100644 (file)
index 0000000..3563c48
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/new13.C
@@ -0,0 +1,11 @@
+// PR c++/22508
+// ICE on invalid operator new
+// Origin: Flash Sheridan  <flash@pobox.com>
+// { dg-do compile }
+
+struct A
+{
+  void* operator new(__SIZE_TYPE__) throw(X);  // { dg-error "" }
+};
+
+A* p = new A;                                  // { dg-error "no suitable" }