From 8da8ba5a1cc7adf3ad5a4576510aae5c31ae0a6e Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" <paul@apatience.com>
Date: Mon, 14 Feb 2022 10:41:07 +0000
Subject: Fix various instances of implicit conversions.

The implicit conversions were discovered with Clang's UBSan (with
the -fsanitizer=implicit-conversion option).

* gc.c (sweep_one): Convert only the inverted REACHABLE, since
block->t.type is already of the right type.

* hash.c (eql_hash, eq_hash, hash_iter_init, us_hash_iter_init):
Explicitly convert to ucnum.

* linenoise/linenoise.c (enable_raw_mode): Explicitly convert the
inverted flag sets to tcflag_t.

* mpi/mpi.c (mp_set_uintptr): Explicitly convert to uint_ptr_t.

* regex.c (char_set_add): Explicitly convert to bitcell_t.

* struct.c (struct_inst_hash): Correct type of hash from cnum to
ucnum.
---
 hash.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'hash.c')

diff --git a/hash.c b/hash.c
index dcbd31b2..1b3030c2 100644
--- a/hash.c
+++ b/hash.c
@@ -395,7 +395,7 @@ static ucnum eql_hash(val obj, int *count)
     case NIL:
       return convert(ucnum, -1);
     case BGNUM:
-      return mp_hash(mp(obj));
+      return convert(ucnum, mp_hash(mp(obj)));
     case FLNUM:
       return hash_double(obj->fl.n);
     case RNG:
@@ -409,9 +409,9 @@ static ucnum eql_hash(val obj, int *count)
       }
     }
   case TAG_CHR:
-    return c_chr(obj);
+    return convert(ucnum, c_chr(obj));
   case TAG_NUM:
-    return c_num(obj, self);
+    return convert(ucnum, c_num(obj, self));
   case TAG_LIT:
     switch (CHAR_BIT * sizeof (mem_t *)) {
     case 32:
@@ -437,9 +437,9 @@ static ucnum eq_hash(val obj)
       return coerce(ucnum, obj) >> 5;
     }
   case TAG_CHR:
-    return c_chr(obj);
+    return convert(ucnum, c_chr(obj));
   case TAG_NUM:
-    return c_num(obj, self);
+    return convert(ucnum, c_num(obj, self));
   case TAG_LIT:
     switch (CHAR_BIT * sizeof (mem_t *)) {
     case 32:
@@ -1204,7 +1204,7 @@ void hash_iter_init(struct hash_iter *hi, val hash, val self)
 {
   struct hash *h = coerce(struct hash *, cobj_handle(self, hash, hash_cls));
   hi->next = 0;
-  hi->chain = -1;
+  hi->chain = convert(ucnum, -1);
   hi->cons = nil;
   hi->hash = hash;
   h->usecount++;
@@ -1214,7 +1214,7 @@ void us_hash_iter_init(struct hash_iter *hi, val hash)
 {
   struct hash *h = coerce(struct hash *, hash->co.handle);
   hi->next = 0;
-  hi->chain = -1;
+  hi->chain = convert(ucnum, -1);
   hi->cons = nil;
   hi->hash = hash;
   h->usecount++;
-- 
cgit v1.2.3