From: Thomas Schwinge <tschwinge@baylibre.com>
Date: Tue, 15 Oct 2024 07:29:53 +0000 (+0200)
Subject: Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device... 
X-Git-Tag: basepoints/gcc-16~5205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa90febea9801d4255bf6a1e9f0fd998629c3c7c;p=thirdparty%2Fgcc.git

Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device: Fix 'is_builtin' initialization

Bug fix for commit 3269a722b7a03613e9c4e2862bc5088c4a17cc11
"Fortran: Use OpenACC's acc_on_device builtin, fix OpenMP' __builtin_is_initial_device".

	PR fortran/82250
	PR fortran/82251
	PR fortran/117136
	gcc/fortran/
	* trans-expr.cc (gfc_conv_procedure_call): Initialize
	'is_builtin'.
	(conv_function_val): Clean up.

Co-authored-by: Harald Anlauf <anlauf@gmx.de>
---

diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc
index b9f585d0d2f..569b92a48ab 100644
--- a/gcc/fortran/trans-expr.cc
+++ b/gcc/fortran/trans-expr.cc
@@ -4437,7 +4437,6 @@ conv_function_val (gfc_se * se, bool *is_builtin, gfc_symbol * sym,
 {
   tree tmp;
 
-  *is_builtin = false;
   if (gfc_is_proc_ptr_comp (expr))
     tmp = get_proc_ptr_comp (expr);
   else if (sym->attr.dummy)
@@ -8218,6 +8217,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
   arglist = retargs;
 
   /* Generate the actual call.  */
+  is_builtin = false;
   if (base_object == NULL_TREE)
     conv_function_val (se, &is_builtin, sym, expr, args);
   else