From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id F15A1385801F for ; Tue, 18 Jan 2022 09:52:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F15A1385801F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x11.wildebeest.org [172.31.17.147]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 4430930BE62D; Tue, 18 Jan 2022 10:52:56 +0100 (CET) Received: by reform (Postfix, from userid 1000) id 7A21B2E815DA; Tue, 18 Jan 2022 10:52:55 +0100 (CET) Date: Tue, 18 Jan 2022 10:52:55 +0100 From: Mark Wielaard To: Giuliano Procida Cc: libabigail@sourceware.org, dodji@seketeli.org, kernel-team@android.com, maennich@google.com Subject: Re: [PATCH] DWARF reader: use size_t for DWARF expression length Message-ID: References: <20220117145115.659444-1-gprocida@google.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="KBTlNMfTPUfDfD/z" Content-Disposition: inline In-Reply-To: <20220117145115.659444-1-gprocida@google.com> X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 09:53:00 -0000 --KBTlNMfTPUfDfD/z Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Giuliano, On Mon, Jan 17, 2022 at 02:51:15PM +0000, Giuliano Procida wrote: > A recent change broke 32-bit builds due to an implicit assumption that > size_t == uint64_t. This appears in the elfutils dwarf_getlocation* > functions' types. > > This commit updates callers and other functions to use size_t > consistently for such expression lengths and indexes. > > * src/abg-dwarf-reader.cc (die_location_expr): Change expr_len > argument type to size_t*. > (op_manipulates_stack): Change expr_len and index argument > types to size_t; change next_index argument type to size_t&. > (eval_last_constant_dwarf_sub_expr): Change expr_len argument > and local variables index and next_index types to size_t. > (die_member_offset): Change local variable expr_len type to > size_t. > (die_location_address): Likewise. > (die_virtual_function_index): Likewise. I also needed to change the len and index arguments of eval_last_constant_dwarf_sub_expr, op_pushes_constant_value, op_pushes_non_constant_value, op_is_arith_logic and op_is_control_flow. See attached. Cheers, Mark --KBTlNMfTPUfDfD/z Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index f125196d..d8545b4c 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -363,7 +363,7 @@ die_is_at_class_scope(const read_context& ctxt, Dwarf_Die& class_scope_die); static bool eval_last_constant_dwarf_sub_expr(Dwarf_Op* expr, - uint64_t expr_len, + size_t expr_len, int64_t& value, bool& is_tls_address); @@ -7686,7 +7686,7 @@ static bool die_location_expr(const Dwarf_Die* die, unsigned attr_name, Dwarf_Op** expr, - uint64_t* expr_len) + size_t* expr_len) { if (!die) return false; @@ -7732,9 +7732,9 @@ die_location_expr(const Dwarf_Die* die, /// value onto the DEVM stack, false otherwise. static bool op_pushes_constant_value(Dwarf_Op* ops, - uint64_t ops_len, - uint64_t index, - uint64_t& next_index, + size_t ops_len, + size_t index, + size_t& next_index, dwarf_expr_eval_context& ctxt) { ABG_ASSERT(index < ops_len); @@ -7896,9 +7896,9 @@ op_pushes_constant_value(Dwarf_Op* ops, /// non-constant value onto the DEVM stack, false otherwise. static bool op_pushes_non_constant_value(Dwarf_Op* ops, - uint64_t ops_len, - uint64_t index, - uint64_t& next_index, + size_t ops_len, + size_t index, + size_t& next_index, dwarf_expr_eval_context& ctxt) { ABG_ASSERT(index < ops_len); @@ -8022,9 +8022,9 @@ op_pushes_non_constant_value(Dwarf_Op* ops, /// DEVM stack, false otherwise. static bool op_manipulates_stack(Dwarf_Op* expr, - uint64_t expr_len, - uint64_t index, - uint64_t& next_index, + size_t expr_len, + size_t index, + size_t& next_index, dwarf_expr_eval_context& ctxt) { Dwarf_Op& op = expr[index]; @@ -8146,9 +8146,9 @@ op_manipulates_stack(Dwarf_Op* expr, /// arithmetic or logic operation. static bool op_is_arith_logic(Dwarf_Op* expr, - uint64_t expr_len, - uint64_t index, - uint64_t& next_index, + size_t expr_len, + size_t index, + size_t& next_index, dwarf_expr_eval_context& ctxt) { ABG_ASSERT(index < expr_len); @@ -8279,9 +8279,9 @@ op_is_arith_logic(Dwarf_Op* expr, /// control flow operation, false otherwise. static bool op_is_control_flow(Dwarf_Op* expr, - uint64_t expr_len, - uint64_t index, - uint64_t& next_index, + size_t expr_len, + size_t index, + size_t& next_index, dwarf_expr_eval_context& ctxt) { ABG_ASSERT(index < expr_len); @@ -8398,7 +8398,7 @@ eval_quickly(Dwarf_Op* expr, /// to evaluate, false otherwise. static bool eval_last_constant_dwarf_sub_expr(Dwarf_Op* expr, - uint64_t expr_len, + size_t expr_len, int64_t& value, bool& is_tls_address, dwarf_expr_eval_context &eval_ctxt) @@ -8407,7 +8407,7 @@ eval_last_constant_dwarf_sub_expr(Dwarf_Op* expr, // expression contained in the DWARF expression 'expr'. eval_ctxt.reset(); - uint64_t index = 0, next_index = 0; + size_t index = 0, next_index = 0; do { if (op_is_arith_logic(expr, expr_len, index, @@ -8452,7 +8452,7 @@ eval_last_constant_dwarf_sub_expr(Dwarf_Op* expr, /// to evaluate, false otherwise. static bool eval_last_constant_dwarf_sub_expr(Dwarf_Op* expr, - uint64_t expr_len, + size_t expr_len, int64_t& value, bool& is_tls_address) { @@ -8775,7 +8775,7 @@ die_member_offset(const read_context& ctxt, int64_t& offset) { Dwarf_Op* expr = NULL; - uint64_t expr_len = 0; + size_t expr_len = 0; uint64_t bit_offset = 0; // First let's see if the DW_AT_data_bit_offset attribute is @@ -8852,7 +8852,7 @@ die_location_address(Dwarf_Die* die, bool& is_tls_address) { Dwarf_Op* expr = NULL; - uint64_t expr_len = 0; + size_t expr_len = 0; is_tls_address = false; @@ -8898,7 +8898,7 @@ die_virtual_function_index(Dwarf_Die* die, return false; Dwarf_Op* expr = NULL; - uint64_t expr_len = 0; + size_t expr_len = 0; if (!die_location_expr(die, DW_AT_vtable_elem_location, &expr, &expr_len)) return false; --KBTlNMfTPUfDfD/z--