Re: [PATCH 07/17] kern/rdxtree: Fix undefined behavior

2024-03-27 Thread Samuel Thibault
Applied, thanks!

Sergey Bugaev, le mer. 27 mars 2024 19:18:31 +0300, a ecrit:
> Initializing a variable with itself is undefined, and GCC 14 rightfully
> produces a warning about the variable being used (to initialize itself)
> prior to initialization. X15 sets the variables to 0 instead, so do the
> same in Mach.
> ---
>  kern/rdxtree.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kern/rdxtree.c b/kern/rdxtree.c
> index a23d6e7e..6d03710c 100644
> --- a/kern/rdxtree.c
> +++ b/kern/rdxtree.c
> @@ -437,7 +437,7 @@ rdxtree_insert_common(struct rdxtree *tree, rdxtree_key_t 
> key,
>void *ptr, void ***slotp)
>  {
>  struct rdxtree_node *node, *prev;
> -unsigned int height, shift, index = index;
> +unsigned int height, shift, index = 0;
>  int error;
>  
>  assert(ptr != NULL);
> @@ -513,7 +513,7 @@ rdxtree_insert_alloc_common(struct rdxtree *tree, void 
> *ptr,
>  rdxtree_key_t *keyp, void ***slotp)
>  {
>  struct rdxtree_node *node, *prev;
> -unsigned int height, shift, index = index;
> +unsigned int height, shift, index = 0;
>  rdxtree_key_t key;
>  int error;
>  
> -- 
> 2.44.0
> 
> 

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.



[PATCH 07/17] kern/rdxtree: Fix undefined behavior

2024-03-27 Thread Sergey Bugaev
Initializing a variable with itself is undefined, and GCC 14 rightfully
produces a warning about the variable being used (to initialize itself)
prior to initialization. X15 sets the variables to 0 instead, so do the
same in Mach.
---
 kern/rdxtree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kern/rdxtree.c b/kern/rdxtree.c
index a23d6e7e..6d03710c 100644
--- a/kern/rdxtree.c
+++ b/kern/rdxtree.c
@@ -437,7 +437,7 @@ rdxtree_insert_common(struct rdxtree *tree, rdxtree_key_t 
key,
   void *ptr, void ***slotp)
 {
 struct rdxtree_node *node, *prev;
-unsigned int height, shift, index = index;
+unsigned int height, shift, index = 0;
 int error;
 
 assert(ptr != NULL);
@@ -513,7 +513,7 @@ rdxtree_insert_alloc_common(struct rdxtree *tree, void *ptr,
 rdxtree_key_t *keyp, void ***slotp)
 {
 struct rdxtree_node *node, *prev;
-unsigned int height, shift, index = index;
+unsigned int height, shift, index = 0;
 rdxtree_key_t key;
 int error;
 
-- 
2.44.0