From: Tobias Burnus <tburnus@baylibre.com>
Date: Thu, 31 Oct 2024 11:37:46 +0000 (+0100)
Subject: OpenMP/C++: Use STRIP_REFERENCE_REF to fix declare variant with reference-returning... 
X-Git-Tag: basepoints/gcc-16~4752
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7ae087ef0132b01c3a2c04932058b996ebda18d;p=thirdparty%2Fgcc.git

OpenMP/C++: Use STRIP_REFERENCE_REF to fix declare variant with reference-returning functions

As Jakub suggested, use STRIP_REFERENCE_REF instead of doing it manually
as r15-4800-geb828a1e380e7b did.

gcc/cp/ChangeLog:

	* decl.cc (omp_declare_variant_finalize_one): Use STRIP_REFERENCE_REF
	instead of doing it manually.
---

diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index b638f3af294d..0e4533c6faba 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -8375,10 +8375,7 @@ omp_declare_variant_finalize_one (tree decl, tree attr)
   if (variant == error_mark_node && !processing_template_decl)
     return true;
 
-  if (TREE_CODE (variant) == INDIRECT_REF)
-    variant = TREE_OPERAND (variant, 0);
-
-  variant = cp_get_callee_fndecl_nofold (variant);
+  variant = cp_get_callee_fndecl_nofold (STRIP_REFERENCE_REF (variant));
   input_location = save_loc;
 
   if (variant)