From: "Guillermo E. Martinez" <guillermo.e.martinez@oracle.com>
To: libabigail@sourceware.org
Subject: [PATCH] ctf-reader: Fix length in dynamic array definition
Date: Fri, 26 Nov 2021 17:17:18 -0600 [thread overview]
Message-ID: <20211126231718.119513-1-guillermo.e.martinez@oracle.com> (raw)
Hello libabigail team,
This patch fix the `length' property of `subrange' node when
we define a dynamic length array,
Please let me know your comments,
Thanks in advanced!,
Guillermo
Defining an array type with dynamic length, node `subrange'
in the abixml file doesn't write the accurate `length'
property `infinite', instead `1' is written:
<subrange length='1' .../>
So, member function `array_type_def::subrange_type::is_infinite'
is set when `upper_bound' value is equal to `0' or UINT64_MAX.
* src/abg-ctf-reader.cc (process_ctf_array_type):
set subrange_type::is_infinite when `upper_bound' value
is equal to `0' or UINT64_MAX.
Signed-off-by: Guillermo E. Martinez <guillermo.e.martinez@oracle.com>
---
src/abg-ctf-reader.cc | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/abg-ctf-reader.cc b/src/abg-ctf-reader.cc
index c571d825..687686d9 100644
--- a/src/abg-ctf-reader.cc
+++ b/src/abg-ctf-reader.cc
@@ -472,6 +472,7 @@ process_ctf_array_type(read_context *ctxt,
{
array_type_def_sptr result;
ctf_arinfo_t ctf_ainfo;
+ bool is_infinite = false;
/* First, get the information about the CTF array. */
if (static_cast<ctf_id_t>(ctf_array_info(ctf_dictionary,
@@ -507,6 +508,19 @@ process_ctf_array_type(read_context *ctxt,
lower_bound.set_unsigned(0); /* CTF supports C only. */
upper_bound.set_unsigned(nelems > 0 ? nelems - 1 : 0U);
+ if (upper_bound.get_unsigned_value() == 0)
+ {
+ is_infinite = true;
+ }
+
+ if (UINT64_MAX == upper_bound.get_unsigned_value())
+ {
+ // If the upper_bound size is the max of the integer value, then
+ // it most certainly means infinite size.
+ is_infinite = true;
+ upper_bound.set_unsigned(0);
+ }
+
subrange.reset(new array_type_def::subrange_type(ctxt->ir_env,
"",
lower_bound,
@@ -517,6 +531,12 @@ process_ctf_array_type(read_context *ctxt,
if (!subrange)
return result;
+ subrange->is_infinite(is_infinite);
+ ABG_ASSERT(subrange->is_infinite()
+ || (subrange->get_length() ==
+ (uint64_t) (subrange->get_upper_bound()
+ - subrange->get_lower_bound() + 1)));
+
add_decl_to_scope(subrange, tunit->get_global_scope());
canonicalize(subrange);
subranges.push_back(subrange);
--
2.33.0
next reply other threads:[~2021-11-26 23:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 23:17 Guillermo E. Martinez [this message]
2021-11-27 18:03 ` Jose E. Marchesi
2021-11-28 1:57 ` Guillermo Martinez
2021-11-28 1:56 ` [PATCH v2] " Guillermo E. Martinez
2021-11-29 13:32 ` Jose E. Marchesi
2021-12-10 3:00 ` Guillermo Martinez
2021-12-14 11:20 ` Dodji Seketeli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211126231718.119513-1-guillermo.e.martinez@oracle.com \
--to=guillermo.e.martinez@oracle.com \
--cc=libabigail@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).