From: Nick Alcock <nick.alcock@oracle.com>
Date: Tue, 2 Jun 2020 19:23:07 +0000 (+0100)
Subject: libctf, create: add explicit casts for variables' and slices' types
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9943fa3a7320158e209a0339a4022a8165e9d5a6;p=binutils-gdb.git

libctf, create: add explicit casts for variables' and slices' types

This is technically unnecessary -- the compiler is quite capable of
doing the range reduction for us -- but it does mean that all
assignments of a ctf_id_t to its final uint32_t representation now have
appropriate explicit casts.

libctf/
	* ctf-create.c (ctf_serialize): Add cast.
	(ctf_add_slice): Likewise.
---

diff --git a/libctf/ChangeLog b/libctf/ChangeLog
index 39cf47d0b36..598b93a0117 100644
--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-22  Nick Alcock  <nick.alcock@oracle.com>
+
+	* ctf-create.c (ctf_serialize): Add cast.
+	(ctf_add_slice): Likewise.
+
 2020-07-22  Nick Alcock  <nick.alcock@oracle.com>
 
 	* ctf-impl.h (ctf_dtdef_t) <dtu_argv>: Fix type.
diff --git a/libctf/ctf-create.c b/libctf/ctf-create.c
index f91da6ea159..bc0ad802dd2 100644
--- a/libctf/ctf-create.c
+++ b/libctf/ctf-create.c
@@ -373,7 +373,7 @@ ctf_serialize (ctf_file_t *fp)
       ctf_varent_t *var = &dvarents[i];
 
       ctf_str_add_ref (fp, dvd->dvd_name, &var->ctv_name);
-      var->ctv_type = dvd->dvd_type;
+      var->ctv_type = (uint32_t) dvd->dvd_type;
     }
   assert (i == nvars);
 
@@ -972,7 +972,7 @@ ctf_add_slice (ctf_file_t *fp, uint32_t flag, ctf_id_t ref,
   dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_SLICE, flag, 0);
   dtd->dtd_data.ctt_size = clp2 (P2ROUNDUP (ep->cte_bits, CHAR_BIT)
 				 / CHAR_BIT);
-  dtd->dtd_u.dtu_slice.cts_type = ref;
+  dtd->dtd_u.dtu_slice.cts_type = (uint32_t) ref;
   dtd->dtd_u.dtu_slice.cts_bits = ep->cte_bits;
   dtd->dtd_u.dtu_slice.cts_offset = ep->cte_offset;