For nvptx offloading, make sure to emit C++ constructor, destructor aliases [PR97106]

	PR target/97106
	gcc/
	* config/nvptx/nvptx.cc (nvptx_asm_output_def_from_decls)
	[ACCEL_COMPILER]: Make sure to emit C++ constructor, destructor
	aliases.
	libgomp/
	* testsuite/libgomp.c++/pr96390.C: Un-XFAIL nvptx offloading.
	* testsuite/libgomp.c-c++-common/pr96390.c: Adjust.

(cherry picked from commit ca9cffe737d20953082333dacebb65d4261e0d0c)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 78f31903196ecc002f5c623a9dbad2653c762a43..6988afbd23886a830fe72c09ccd2ec503ca117ef 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,5 +1,13 @@
 2025-04-17  Thomas Schwinge  <tschwinge@baylibre.com>
 
+       Backported from trunk:
+       2025-04-16  Thomas Schwinge  <tschwinge@baylibre.com>
+
+       PR target/97106
+       * config/nvptx/nvptx.cc (nvptx_asm_output_def_from_decls)
+       [ACCEL_COMPILER]: Make sure to emit C++ constructor, destructor
+       aliases.
+
        Backported from trunk:
        2025-04-14  Thomas Schwinge  <tschwinge@baylibre.com>
 

diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc
index b8116e83c5f1b2e7f3bcadbffb368021bec2d6ca..2c29091bfc194cfcd29393c11b858160e8d2750b 100644 (file)
--- a/gcc/config/nvptx/nvptx.cc
+++ b/gcc/config/nvptx/nvptx.cc
@@ -8518,6 +8518,18 @@ nvptx_asm_output_def_from_decls (FILE *stream, tree name,
 #endif
 
   cgraph_node *cnode = cgraph_node::get (name);
+#ifdef ACCEL_COMPILER
+  /* For nvptx offloading, make sure to emit C++ constructor, destructor aliases [PR97106]
+
+     For some reason (yet to be analyzed), they're not 'cnode->referred_to_p ()'.
+     (..., or that's not the right approach at all;
+     <https://inbox.sourceware.org/87v7rx8lbx.fsf@euler.schwinge.ddns.net>
+     "Re: [committed][nvptx] Use .alias directive for mptx >= 6.3").  */
+  if (DECL_CXX_CONSTRUCTOR_P (name)
+      || DECL_CXX_DESTRUCTOR_P (name))
+    ;
+  else
+#endif
   if (!cnode->referred_to_p ())
     /* Prevent "Internal error: reference to deleted section".  */
     return;

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 967664b183bd2a5452cf2c5c31cc7beb5eafaaba..5343b9bbecc261cf77768fa9add39e6276b8f125 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,5 +1,12 @@
 2025-04-17  Thomas Schwinge  <tschwinge@baylibre.com>
 
+       Backported from trunk:
+       2025-04-16  Thomas Schwinge  <tschwinge@baylibre.com>
+
+       PR target/97106
+       * testsuite/libgomp.c++/pr96390.C: Un-XFAIL nvptx offloading.
+       * testsuite/libgomp.c-c++-common/pr96390.c: Adjust.
+
        Backported from trunk:
        2025-04-14  Thomas Schwinge  <tschwinge@baylibre.com>
 

diff --git a/libgomp/testsuite/libgomp.c++/pr96390.C b/libgomp/testsuite/libgomp.c++/pr96390.C
index 1f3c3e056618de92c4c3656084ac08925b91cee3..be1960186eaadf8d6acd5245d7f8f3dd045e959c 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/pr96390.C
+++ b/libgomp/testsuite/libgomp.c++/pr96390.C
@@ -1,6 +1,4 @@
 /* { dg-additional-options "-O0 -fdump-tree-omplower" } */
-/* { dg-additional-options "-foffload=-Wa,--verify" { target offload_target_nvptx } } */
-/* { dg-xfail-if "PR 97106/PR 97102 - .alias not (yet) supported for nvptx" { offload_target_nvptx } } */
 
 #include <cstdlib>
 #include <type_traits>

diff --git a/libgomp/testsuite/libgomp.c-c++-common/pr96390.c b/libgomp/testsuite/libgomp.c-c++-common/pr96390.c
index b89f934811a5fb0eb9363632a1f13ee8a5cbbf82..ca7865d322df70fdd7ef3b27c3742dc798e51a5e 100644 (file)
--- a/libgomp/testsuite/libgomp.c-c++-common/pr96390.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/pr96390.c
@@ -1,7 +1,7 @@
 /* { dg-additional-options "-O0 -fdump-tree-omplower" } */
 /* { dg-additional-options "-foffload=-Wa,--verify" { target offload_target_nvptx } } */
 /* { dg-require-alias "" } */
-/* { dg-xfail-if "PR 97102/PR 97106 - .alias not (yet) supported for nvptx" { offload_target_nvptx } } */
+/* { dg-xfail-if PR105018 { offload_target_nvptx } } */
 
 #ifdef __cplusplus
 extern "C" {