2023-07-11 16:46:39 +00:00
|
|
|
From 74b0eee42f616cb05c640c0ceac0cc391e4a7ef1 Mon Sep 17 00:00:00 2001
|
2023-07-10 20:41:36 +00:00
|
|
|
From: Jerry James <loganjerry@gmail.com>
|
|
|
|
|
Date: Fri, 7 Jul 2023 07:07:09 -0600
|
2023-07-11 16:46:39 +00:00
|
|
|
Subject: [PATCH 17/17] Fix skiplist test failure (#12346)
|
2023-07-10 20:41:36 +00:00
|
|
|
|
|
|
|
|
Fix -Wmaybe-uninitialized warning in skiplist test
|
|
|
|
|
Fix -Wunused-variable warning in skiplist test
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Xavier Leroy <xavier.leroy@college-de-france.fr>
|
|
|
|
|
(cherry picked from commit 3027e3308d685af03caf4f605b4bec55b04ed28e)
|
|
|
|
|
(cherry picked from commit 9aa7761060a7c40d11237599382b892dbcb79cb5)
|
|
|
|
|
---
|
|
|
|
|
testsuite/tests/lf_skiplist/stubs.c | 3 +--
|
|
|
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/testsuite/tests/lf_skiplist/stubs.c b/testsuite/tests/lf_skiplist/stubs.c
|
|
|
|
|
index 991483e408..acc0eaf9cf 100644
|
|
|
|
|
--- a/testsuite/tests/lf_skiplist/stubs.c
|
|
|
|
|
+++ b/testsuite/tests/lf_skiplist/stubs.c
|
|
|
|
|
@@ -64,7 +64,7 @@ static int get_len(struct lf_skipcell *p, struct lf_skipcell *end) {
|
|
|
|
|
static uintnat count_marks(struct lf_skiplist *sk) {
|
|
|
|
|
uintnat r = 0;
|
|
|
|
|
struct lf_skipcell *p = sk->head;
|
|
|
|
|
- uintptr_t succ;
|
|
|
|
|
+ uintptr_t succ = 0;
|
|
|
|
|
|
|
|
|
|
while (p) {
|
|
|
|
|
for (int k = p->top_level; k >= 0; k--) {
|
|
|
|
|
@@ -135,7 +135,6 @@ inline static uintnat calc_right(uintnat id,uintnat turn,uintnat ndoms) { return
|
|
|
|
|
CAMLprim value insert_skiplist(value turn_val,value ndoms_val,value domain_id_val) {
|
|
|
|
|
CAMLparam3(turn_val,ndoms_val,domain_id_val);
|
|
|
|
|
uintnat domain_id = Long_val(domain_id_val);
|
|
|
|
|
- uintnat ndoms = Long_val(ndoms_val);
|
|
|
|
|
uintnat turn = Long_val(turn_val);
|
|
|
|
|
uintnat k = calc_key(domain_id,turn) ;
|
|
|
|
|
uintnat v = calc_value(domain_id) ;
|
|
|
|
|
--
|
|
|
|
|
2.41.0
|
|
|
|
|
|
