From patchwork Thu Jul 30 15:14:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 40194 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 683EB3851C2C; Thu, 30 Jul 2020 15:14:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 683EB3851C2C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1596122087; bh=M2rApCjgK8sdWO1bvtNG1tbh+AYP0zK90D5BUD81VpM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=BTqzOO4s3FAgaML2VjUxbbvMP6a65kRqcg0EAE81+VWE9EMdDT9R3sXXpjUsYu53a FemkpKP0zI1ItA3b2tsJUcyDeZT5A4+Jw7fxeEbhIhFm5U4VVhqqKrwgSUBba/qydf Ms0z1hmcZRLLVAJoNFTju5svLghGSLq0tfO2fNik= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by sourceware.org (Postfix) with ESMTP id 2F0FF3857C61 for ; Thu, 30 Jul 2020 15:14:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2F0FF3857C61 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-26-E28io3TDPKSTM6FqDf8hKQ-1; Thu, 30 Jul 2020 11:14:42 -0400 X-MC-Unique: E28io3TDPKSTM6FqDf8hKQ-1 Received: by mail-wm1-f72.google.com with SMTP id s2so1454690wmj.7 for ; Thu, 30 Jul 2020 08:14:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:organization:date:message-id :user-agent:mime-version; bh=M2rApCjgK8sdWO1bvtNG1tbh+AYP0zK90D5BUD81VpM=; b=mSeyZgr4JKcDXuT51ATeccRNGCcXGug5ke4HwH0ZTiuvbojwDhL+wZCYv6s/344kW+ r6BZk7g7otcaK26k74p2sbiemRM0T+5R23kI7UGRqs+zLMhyZNWX6r0YDIq3SO2RCsjk bn4AROoC5JgFXhmr2FA568AbqsL5Es1Qx9NBrnyDVczqgD544l8kdm5/ng0khmjBICGg X9HGVBelr8eGZ2lS9KsAMujrN8fbYMeAXhB5/0giePe2gNeu3NfAwMjg2eq78WcV7qol rP28eLsRKipsaWj+TstDn+SfGkOO1dg0+J0olf/dtM6OdyWpaOyWAQyXl+dHXoR29zt/ +3ag== X-Gm-Message-State: AOAM531BgeTDObbr2sLgDs9MRiNKwXWot50Co1J0tvFffbRKnHBTLkK/ 4DBtZZmHY4rYuz/wKppiN9eCC4MQCg1OQcvOeHzA0UEXTjFU5he7T5vG+41z3+CdB+xA32G3LLR uv57J96TYb/dY6d9tebnK X-Received: by 2002:a5d:6a4a:: with SMTP id t10mr3431520wrw.360.1596122081151; Thu, 30 Jul 2020 08:14:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypKbGgyVX5W/Sa8CMzlAtngXmqaHo0fOOWsllKWZjSBXdr4QdCdfAV70JUieOwVG+zdqJAXQ== X-Received: by 2002:a5d:6a4a:: with SMTP id t10mr3431494wrw.360.1596122080820; Thu, 30 Jul 2020 08:14:40 -0700 (PDT) Received: from localhost (91-166-131-130.subs.proxad.net. [91.166.131.130]) by smtp.gmail.com with ESMTPSA id r22sm2170089wmh.45.2020.07.30.08.14.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jul 2020 08:14:40 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 55F9618008D0; Thu, 30 Jul 2020 17:14:38 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH] dwarf-reader: re-indent a block of code Organization: Red Hat / France X-Operating-System: Red Hat Enterprise Linux Workstation 7.8 Beta X-URL: http://www.redhat.com Date: Thu, 30 Jul 2020 17:14:38 +0200 Message-ID: <87wo2lf31d.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-Patchwork-Original-From: Dodji Seketeli via Libabigail From: Dodji Seketeli Reply-To: Dodji Seketeli Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" -- From 63cfd6142cc809de68d34d11f518c90872167332 Mon Sep 17 00:00:00 2001 Hello, While looking at something else, I noticed that a block of code in compare_dies wasn't properly indented. Fixed thus. Applied to master. * src/abg-dwarf-reader.cc (compare_dies): Properly indent a sub-block of the big switch case statement in there. Signed-off-by: Dodji Seketeli --- src/abg-dwarf-reader.cc | 134 ++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 98ac0f6..533c2dc 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -11875,75 +11875,75 @@ compare_dies(const read_context& ctxt, || (aggregates_being_compared.find(rn) != aggregates_being_compared.end())) result = true; - else if (l_tag == DW_TAG_subroutine_type) - { - // The string reprs of l and r are already equal. Now let's - // just check if they both come from the same TU. - bool from_the_same_tu = false; - if (compare_dies_cu_decl_file(l, r, from_the_same_tu) - && from_the_same_tu) - result = true; - } - else - { - if (!fn_die_equal_by_linkage_name(ctxt, l, r)) - { - result = false; - break; - } - - if (!ctxt.die_is_in_c(l) && !ctxt.die_is_in_c(r)) - { - // In C, we cannot have two different functions with the - // same linkage name in a given binary. But here we are - // looking at DIEs that don't originate from C. So we - // need to compare return types and parameter types. - Dwarf_Die l_return_type, r_return_type; - bool l_return_type_is_void = !die_die_attribute(l, DW_AT_type, - l_return_type); - bool r_return_type_is_void = !die_die_attribute(r, DW_AT_type, - r_return_type); - if (l_return_type_is_void != r_return_type_is_void - || (!l_return_type_is_void - && !compare_dies(ctxt, - &l_return_type, &r_return_type, - aggregates_being_compared, - update_canonical_dies_on_the_fly))) + else if (l_tag == DW_TAG_subroutine_type) + { + // The string reprs of l and r are already equal. Now + // let's just check if they both come from the same TU. + bool from_the_same_tu = false; + if (compare_dies_cu_decl_file(l, r, from_the_same_tu) + && from_the_same_tu) + result = true; + } + else + { + if (!fn_die_equal_by_linkage_name(ctxt, l, r)) + { result = false; - else - { - Dwarf_Die l_child, r_child; - bool found_l_child, found_r_child; - for (found_l_child = dwarf_child(const_cast(l), - &l_child) == 0, - found_r_child = dwarf_child(const_cast(r), - &r_child) == 0; - found_l_child && found_r_child; - found_l_child = dwarf_siblingof(&l_child, - &l_child) == 0, - found_r_child = dwarf_siblingof(&r_child, - &r_child)==0) - { - int l_child_tag = dwarf_tag(&l_child); - int r_child_tag = dwarf_tag(&r_child); - if (l_child_tag != r_child_tag - || (l_child_tag == DW_TAG_formal_parameter - && !compare_dies(ctxt, &l_child, &r_child, - aggregates_being_compared, - update_canonical_dies_on_the_fly))) - { - result = false; - break; - } - } - if (found_l_child != found_r_child) - result = false; - } - } + break; + } - aggregates_being_compared.erase(ln); - aggregates_being_compared.erase(rn); - } + if (!ctxt.die_is_in_c(l) && !ctxt.die_is_in_c(r)) + { + // In C, we cannot have two different functions with the + // same linkage name in a given binary. But here we are + // looking at DIEs that don't originate from C. So we + // need to compare return types and parameter types. + Dwarf_Die l_return_type, r_return_type; + bool l_return_type_is_void = !die_die_attribute(l, DW_AT_type, + l_return_type); + bool r_return_type_is_void = !die_die_attribute(r, DW_AT_type, + r_return_type); + if (l_return_type_is_void != r_return_type_is_void + || (!l_return_type_is_void + && !compare_dies(ctxt, + &l_return_type, &r_return_type, + aggregates_being_compared, + update_canonical_dies_on_the_fly))) + result = false; + else + { + Dwarf_Die l_child, r_child; + bool found_l_child, found_r_child; + for (found_l_child = dwarf_child(const_cast(l), + &l_child) == 0, + found_r_child = dwarf_child(const_cast(r), + &r_child) == 0; + found_l_child && found_r_child; + found_l_child = dwarf_siblingof(&l_child, + &l_child) == 0, + found_r_child = dwarf_siblingof(&r_child, + &r_child)==0) + { + int l_child_tag = dwarf_tag(&l_child); + int r_child_tag = dwarf_tag(&r_child); + if (l_child_tag != r_child_tag + || (l_child_tag == DW_TAG_formal_parameter + && !compare_dies(ctxt, &l_child, &r_child, + aggregates_being_compared, + update_canonical_dies_on_the_fly))) + { + result = false; + break; + } + } + if (found_l_child != found_r_child) + result = false; + } + } + + aggregates_being_compared.erase(ln); + aggregates_being_compared.erase(rn); + } } break;