This patch attempts to add __builtin_operator_new/delete. So far they
are not optimized, which will need to be done by extra flag of BUILT_IN_
code.  also the decl.cc code can be refactored to be less of cut&paste
and I guess has_builtin hack to return proper value needs to be moved
to C++ FE.

However the immediate problem I run into is that libstdc++ testuiste
fails due to lack of std::nothrow overrides.  I wonder how to get that
working?
diff --git a/gcc/c-family/c-lex.cc b/gcc/c-family/c-lex.cc
index ff5ce2bf729..602b097059c 100644
--- a/gcc/c-family/c-lex.cc
+++ b/gcc/c-family/c-lex.cc
@@ -533,6 +533,10 @@ c_common_has_builtin (cpp_reader *pfile)
   if (!name)
     return 0;
 
+  if (!strcmp (name, "__builtin_operator_new")
+      || !strcmp (name, "__builtin_operator_delete"))
+    return 201802L;
+
   return names_builtin_p (name);
 }
 
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 3fc8835154d..90b100ca3dc 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -59,6 +59,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "omp-general.h"
 #include "omp-offload.h"  /* For offload_vars.  */
 #include "opts.h"
+#include "print-tree.h"
 #include "langhooks-def.h"  /* For lhd_simulate_record_decl  */
 
 /* Possible cases of bad specifiers type used by bad_specifiers. */
@@ -5048,13 +5049,27 @@ cxx_init_decl_processing (void)
     DECL_IS_MALLOC (opnew) = 1;
     DECL_SET_IS_OPERATOR_NEW (opnew, true);
     DECL_IS_REPLACEABLE_OPERATOR (opnew) = 1;
+    tree builtin_opnew = build_cp_library_fn 
(get_identifier("__builtin_operator_new"),
+                                             NEW_EXPR, newtype, 0);
+    DECL_IS_MALLOC (builtin_opnew) = 1;
+    DECL_SET_IS_OPERATOR_NEW (builtin_opnew, true);
+    DECL_IS_REPLACEABLE_OPERATOR (builtin_opnew) = 1;
+    SET_DECL_ASSEMBLER_NAME (builtin_opnew, DECL_ASSEMBLER_NAME (opnew));
+    pushdecl (builtin_opnew);
     opnew = push_cp_library_fn (VEC_NEW_EXPR, newtype, 0);
     DECL_IS_MALLOC (opnew) = 1;
     DECL_SET_IS_OPERATOR_NEW (opnew, true);
     DECL_IS_REPLACEABLE_OPERATOR (opnew) = 1;
+
     tree opdel = push_cp_library_fn (DELETE_EXPR, deltype, ECF_NOTHROW);
     DECL_SET_IS_OPERATOR_DELETE (opdel, true);
     DECL_IS_REPLACEABLE_OPERATOR (opdel) = 1;
+    tree builtin_opdel = build_cp_library_fn 
(get_identifier("__builtin_operator_delete"),
+                                             DELETE_EXPR, deltype, 
ECF_NOTHROW);
+    DECL_SET_IS_OPERATOR_DELETE (builtin_opdel, true);
+    DECL_IS_REPLACEABLE_OPERATOR (builtin_opdel) = 1;
+    SET_DECL_ASSEMBLER_NAME (builtin_opdel, DECL_ASSEMBLER_NAME (opdel));
+    pushdecl (builtin_opdel);
     opdel = push_cp_library_fn (VEC_DELETE_EXPR, deltype, ECF_NOTHROW);
     DECL_SET_IS_OPERATOR_DELETE (opdel, true);
     DECL_IS_REPLACEABLE_OPERATOR (opdel) = 1;
@@ -5072,6 +5087,12 @@ cxx_init_decl_processing (void)
        opdel = push_cp_library_fn (DELETE_EXPR, deltype, ECF_NOTHROW);
        DECL_SET_IS_OPERATOR_DELETE (opdel, true);
        DECL_IS_REPLACEABLE_OPERATOR (opdel) = 1;
+       builtin_opdel = build_cp_library_fn 
(get_identifier("__builtin_operator_delete"),
+                                            DELETE_EXPR, deltype, ECF_NOTHROW);
+       DECL_SET_IS_OPERATOR_DELETE (builtin_opdel, true);
+       DECL_IS_REPLACEABLE_OPERATOR (builtin_opdel) = 1;
+       SET_DECL_ASSEMBLER_NAME (builtin_opdel, DECL_ASSEMBLER_NAME (opdel));
+       pushdecl (builtin_opdel);
        opdel = push_cp_library_fn (VEC_DELETE_EXPR, deltype, ECF_NOTHROW);
        DECL_SET_IS_OPERATOR_DELETE (opdel, true);
        DECL_IS_REPLACEABLE_OPERATOR (opdel) = 1;
@@ -5094,6 +5115,13 @@ cxx_init_decl_processing (void)
        DECL_IS_MALLOC (opnew) = 1;
        DECL_SET_IS_OPERATOR_NEW (opnew, true);
        DECL_IS_REPLACEABLE_OPERATOR (opnew) = 1;
+       builtin_opnew = build_cp_library_fn 
(get_identifier("__builtin_operator_new"),
+                                            VEC_NEW_EXPR, newtype, 0);
+       DECL_IS_MALLOC (builtin_opnew) = 1;
+       DECL_SET_IS_OPERATOR_NEW (builtin_opnew, true);
+       DECL_IS_REPLACEABLE_OPERATOR (builtin_opnew) = 1;
+       SET_DECL_ASSEMBLER_NAME (builtin_opnew, DECL_ASSEMBLER_NAME (opnew));
+       pushdecl (builtin_opnew);
        opnew = push_cp_library_fn (VEC_NEW_EXPR, newtype, 0);
        DECL_IS_MALLOC (opnew) = 1;
        DECL_SET_IS_OPERATOR_NEW (opnew, true);
@@ -5107,6 +5135,12 @@ cxx_init_decl_processing (void)
        opdel = push_cp_library_fn (DELETE_EXPR, deltype, ECF_NOTHROW);
        DECL_SET_IS_OPERATOR_DELETE (opdel, true);
        DECL_IS_REPLACEABLE_OPERATOR (opdel) = 1;
+       builtin_opdel = build_cp_library_fn 
(get_identifier("__builtin_operator_delete"),
+                                            DELETE_EXPR, deltype, ECF_NOTHROW);
+       DECL_SET_IS_OPERATOR_DELETE (builtin_opdel, true);
+       DECL_IS_REPLACEABLE_OPERATOR (builtin_opdel) = 1;
+       SET_DECL_ASSEMBLER_NAME (builtin_opdel, DECL_ASSEMBLER_NAME (opdel));
+       pushdecl (builtin_opdel);
        opdel = push_cp_library_fn (VEC_DELETE_EXPR, deltype, ECF_NOTHROW);
        DECL_SET_IS_OPERATOR_DELETE (opdel, true);
        DECL_IS_REPLACEABLE_OPERATOR (opdel) = 1;
@@ -5122,6 +5156,12 @@ cxx_init_decl_processing (void)
            opdel = push_cp_library_fn (DELETE_EXPR, deltype, ECF_NOTHROW);
            DECL_SET_IS_OPERATOR_DELETE (opdel, true);
            DECL_IS_REPLACEABLE_OPERATOR (opdel) = 1;
+           builtin_opdel = build_cp_library_fn 
(get_identifier("__builtin_operator_delete"),
+                                                DELETE_EXPR, deltype, 
ECF_NOTHROW);
+           DECL_SET_IS_OPERATOR_DELETE (builtin_opdel, true);
+           DECL_IS_REPLACEABLE_OPERATOR (builtin_opdel) = 1;
+           SET_DECL_ASSEMBLER_NAME (builtin_opdel, DECL_ASSEMBLER_NAME 
(opdel));
+           pushdecl (builtin_opdel);
            opdel = push_cp_library_fn (VEC_DELETE_EXPR, deltype, ECF_NOTHROW);
            DECL_SET_IS_OPERATOR_DELETE (opdel, true);
            DECL_IS_REPLACEABLE_OPERATOR (opdel) = 1;

Reply via email to