3 files changed, 7 insertions, 4 deletions
diff --git a/arith.c b/arith.c
index 200e6671..1159de96 100644
--- a/arith.c
+++ b/arith.c
@@ -464,7 +464,7 @@ static int highest_significant_bit(int_ptr_t n)
 {
   if (n >= 0)
     return highest_bit(n);
-  return highest_bit(n ^ INT_PTR_MAX);
+  return highest_bit(-n - 1);
 }
 
 void do_mp_error(val self, mp_err code)
@@ -3426,7 +3426,11 @@ val ash(val a, val bits)
         cnum an = c_n(a);
         int hb = highest_significant_bit(an);
         if (bn + hb < num_bits) {
+#if HAVE_UBSAN
+          return num_fast(an * (convert(cnum, 1) << bn));
+#else
           return num_fast(an << bn);
+#endif
         } else {
           val b = make_bignum();
           mp_int tmp;
diff --git a/ffi.c b/ffi.c
index 8388b5cf..63fdf45a 100644
--- a/ffi.c
+++ b/ffi.c
@@ -942,7 +942,7 @@ static val ffi_val_get(struct txr_ffi_type *tft, mem_t *src, val self)
 
 static u16_t ffi_swap_u16(u16_t n)
 {
-  return (n << 8 | n >> 8);
+  return convert(u16_t, n << 8 | n >> 8);
 }
 
 static u32_t ffi_swap_u32(u32_t n)
diff --git a/hash.c b/hash.c
index 1a481061..abefdf24 100644
--- a/hash.c
+++ b/hash.c
@@ -317,9 +317,8 @@ ucnum equal_hash(val obj, int *count, ucnum seed)
   case STR:
     return hash_c_str(obj->st.str, seed, count);
   case CHR:
-    return c_chr(obj);
   case NUM:
-    return c_num(obj, self);
+    return c_u(obj);
   case SYM:
   case PKG:
   case ENV: