[patch] libgomp/splay-tree.h: Fix splay_tree_prefix handling

[patch] libgomp/splay-tree.h: Fix splay_tree_prefix handling

[Tobias Burnus]

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

As is, it is only a cleanup/consistency patch.

However, I did run into this issue when working on the reverse-offload
implementation (to handle reverse lookups of vars and functions).

OK for mainline?

Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955

[-- Attachment #2: splay-tree-fix.diff --]
[-- Type: text/x-patch, Size: 1824 bytes --]

libgomp/splay-tree.h: Fix splay_tree_prefix handling

When splay_tree_prefix is defined, the .h file
defines splay_* macros to add the prefix. However,
before those were only unset when additionally
splay_tree_c was defined.
Additionally, for consistency undefine splay_tree_c
also when no splay_tree_prefix is defined - there
is no interdependence either.

libgomp/ChangeLog:

	* splay-tree.h: Fix splay_* macro unsetting if
	splay_tree_prefix is defined.

 libgomp/splay-tree.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/libgomp/splay-tree.h b/libgomp/splay-tree.h
index 8d66dfb51e0..992381c4000 100644
--- a/libgomp/splay-tree.h
+++ b/libgomp/splay-tree.h
@@ -107,24 +107,24 @@ extern void splay_tree_foreach (splay_tree, splay_tree_callback, void *);
 #else  /* splay_tree_c */
 #  ifdef splay_tree_prefix
 #    include "splay-tree.c"
-#    undef splay_tree_name_1
-#    undef splay_tree_name
-#    undef splay_tree_node_s
-#    undef splay_tree_s
-#    undef splay_tree_key_s
-#    undef splay_tree_node
-#    undef splay_tree
-#    undef splay_tree_key
-#    undef splay_compare
-#    undef splay_tree_lookup
-#    undef splay_tree_insert
-#    undef splay_tree_remove
-#    undef splay_tree_foreach
-#    undef splay_tree_callback
-#    undef splay_tree_c
 #  endif
+#  undef splay_tree_c
 #endif /* #ifndef splay_tree_c */
 
 #ifdef splay_tree_prefix
+#  undef splay_tree_name_1
+#  undef splay_tree_name
+#  undef splay_tree_node_s
+#  undef splay_tree_s
+#  undef splay_tree_key_s
+#  undef splay_tree_node
+#  undef splay_tree
+#  undef splay_tree_key
+#  undef splay_compare
+#  undef splay_tree_lookup
+#  undef splay_tree_insert
+#  undef splay_tree_remove
+#  undef splay_tree_foreach
+#  undef splay_tree_callback
 #  undef splay_tree_prefix
 #endif

Re: [patch] libgomp/splay-tree.h: Fix splay_tree_prefix handling

[Jakub Jelinek]

On Fri, Jul 22, 2022 at 11:47:42AM +0200, Tobias Burnus wrote:
> As is, it is only a cleanup/consistency patch.
> 
> However, I did run into this issue when working on the reverse-offload
> implementation (to handle reverse lookups of vars and functions).
> 
> OK for mainline?
> 
> Tobias
> -----------------
> Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955

> libgomp/splay-tree.h: Fix splay_tree_prefix handling
> 
> When splay_tree_prefix is defined, the .h file
> defines splay_* macros to add the prefix. However,
> before those were only unset when additionally
> splay_tree_c was defined.
> Additionally, for consistency undefine splay_tree_c
> also when no splay_tree_prefix is defined - there
> is no interdependence either.
> 
> libgomp/ChangeLog:
> 
> 	* splay-tree.h: Fix splay_* macro unsetting if
> 	splay_tree_prefix is defined.
> 
>  libgomp/splay-tree.h | 30 +++++++++++++++---------------
>  1 file changed, 15 insertions(+), 15 deletions(-)

Ok.

	Jakub