From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3DKvmYQgKChMz8A7v1wtz77z4x.v7541utu1zt14B7DAvxFtAx.7Az@flex--gprocida.bounces.google.com> Received: from mail-ed1-x549.google.com (mail-ed1-x549.google.com [IPv6:2a00:1450:4864:20::549]) by sourceware.org (Postfix) with ESMTPS id 90D9A3857C58 for ; Tue, 18 Jan 2022 11:57:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 90D9A3857C58 Received: by mail-ed1-x549.google.com with SMTP id k10-20020a50cb8a000000b00403c8326f2aso604440edi.6 for ; Tue, 18 Jan 2022 03:57:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=qQXtTMWkyGIfFeyBkb4xMEKadV0e28BIJPiAxonD2LU=; b=DJOG7lF9on88T2ETtc8jgTtsv/e/0JyVTQVskqgd1wy9X1zgyPo7v8aR19SleVXjtK Fbx6mStV7BM0icC3Ui4Uohmm88s/Qx4jY/C+ZjK3qyWjqZ7/1fc1SnUVrYOAd7rvWGAF As7gHQnmFea3VqC8WA78EzY/yV2sje7rDCkqhjD7jfmValJ68SAP2C/Wi1OdMp3kq7RE LQHiBCItY7kWNqDXSQPpoTPRvzGEMOGXb7oEXLg7pLIR/sChVr62obRmZP5slzUem65a YBmsBi36UpTUnO1wO53PmO44uavaZ2BXTzzfv0HbiSWZJPj408SfvOyzE06TBT9COJF0 25Xw== X-Gm-Message-State: AOAM530ggn78SviEIW8ZhY19i7zhGY1+wASmhVYCV5cPOlBfYjITJQBC yBB9Fjh494kxkq/m76jMylWIc5NjmtQ1zPZhR4lDax3eM3zlw27NXVejXANTTPdF4OmdOwSO/lW 8qFRkLuG13U2tAxlPs/jg5Z0plj8M+dov2hCx/lV9rJctF/cVIyZRS5yuZb6igiuWgdCwo+Q= X-Google-Smtp-Source: ABdhPJw9Q4CDOsvPYNB0OvNcVYjsM8xhWNqtMyQeH8Oza6a0+nQKdKH+AYmp7ff7E9VUBhSEsLzKSCCGQxovlw== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:210:e16e:3291:3ba4:acfc]) (user=gprocida job=sendgmr) by 2002:aa7:cdca:: with SMTP id h10mr24994528edw.279.1642507020813; Tue, 18 Jan 2022 03:57:00 -0800 (PST) Date: Tue, 18 Jan 2022 11:56:45 +0000 Message-Id: <20220118115645.900414-1-gprocida@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog Subject: [PATCH] DWARF reader: use size_t for DWARF expression length cont. From: Giuliano Procida To: libabigail@sourceware.org Cc: dodji@seketeli.org, kernel-team@android.com, gprocida@google.com, maennich@google.com, Mark Wielaard Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-21.4 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL 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 11:57:04 -0000 From: Mark Wielaard A recent change broke 32-bit builds due to an implicit assumption that size_t == uint64_t. Note that size_t is part of the elfutils dwarf_getlocation* functions' types. The previous fix omitted some instances of uint64_t. This commit updates further functions to consistently use size_t for DWARF expression lengths and indexes. * src/abg-dwarf-reader.cc (eval_last_constant_dwarf_sub_expr): Change expr_len argument type to size_t. (op_pushes_constant_value): Update ops_len and index argument types to size_t. Update next_index argument type to size_t&. (op_pushes_non_constant_value): Likewise. (op_is_arith_logic): Update expr_len and index argument types to size_t. Update next_index argument type to size_t&. (op_is_control_flow): Likewise. Fixes: 16207c4af7bc ("Bug 28191 - Interpret DWARF 5 addrx locations") Signed-off-by: Giuliano Procida --- src/abg-dwarf-reader.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 7ee8c04a..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); @@ -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); @@ -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); -- 2.34.1.703.g22d0c6ccf7-goog