Rename gdb exception types

[deliverable/binutils-gdb.git] / gdb / common / new-op.c

diff --git a/gdb/common/new-op.c b/gdb/common/new-op.c
index 5ba4d6e9ca6b88f9d03d6bff82bf24fe050d3c66..b230f111ae71924f9b2324ca3c36155d810c5f4c 100644 (file)
--- a/gdb/common/new-op.c
+++ b/gdb/common/new-op.c
@@ -1,6 +1,6 @@
 /* Replace operator new/new[], for GDB, the GNU debugger.
 
-   Copyright (C) 2016 Free Software Foundation, Inc.
+   Copyright (C) 2016-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,6 +17,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* GCC does not understand __has_feature.  */
+#if !defined(__has_feature)
+# define __has_feature(x) 0
+#endif
+
+#if !__has_feature(address_sanitizer) && !defined(__SANITIZE_ADDRESS__)
 #include "common-defs.h"
 #include "host-defs.h"
 #include <new>
@@ -27,6 +33,12 @@
    new-handler function instead (std::set_new_handler) because we want
    to catch allocation errors from within global constructors too.
 
+   Skip overriding if building with -fsanitize=address though.
+   Address sanitizer wants to override operator new/delete too in
+   order to detect malloc+delete and new+free mismatches.  Our
+   versions would mask out ASan's, with the result of losing that
+   useful mismatch detection.
+
    Note that C++ implementations could either have their throw
    versions call the nothrow versions (libstdc++), or the other way
    around (clang/libc++).  For that reason, we replace both throw and
@@ -48,23 +60,20 @@ operator new (std::size_t sz)
         QUIT gdb_exception.  This is necessary because operator new
         can only ever throw std::bad_alloc, or something that extends
         it.  */
-      TRY
+      try
        {
          malloc_failure (sz);
        }
-      CATCH (ex, RETURN_MASK_ALL)
+      catch (const gdb_exception &ex)
        {
-         do_cleanups (all_cleanups ());
-
          throw gdb_quit_bad_alloc (ex);
        }
-      END_CATCH
     }
   return p;
 }
 
 void *
-operator new (std::size_t sz, const std::nothrow_t&)
+operator new (std::size_t sz, const std::nothrow_t&) noexcept
 {
   /* malloc (0) is unpredictable; avoid it.  */
   if (sz == 0)
@@ -79,7 +88,8 @@ operator new[] (std::size_t sz)
 }
 
 void*
-operator new[] (std::size_t sz, const std::nothrow_t&)
+operator new[] (std::size_t sz, const std::nothrow_t&) noexcept
 {
   return ::operator new (sz, std::nothrow);
 }
+#endif