From patchwork Thu Jun 10 09:19:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 43810 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 4B0E43851C0C for ; Thu, 10 Jun 2021 09:19:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B0E43851C0C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623316792; bh=wUZBXty5UmlaEOhSAlLeIIh3nO165zzxPWZWZ9KVqoU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=tybX1wamoJSTwHZZ7IF2keK34HgxTeQ/l+e5EUFpf5gV56meHkn9YQO31RGDlR0ML Yi24kdeL/CH0ypunvZyPkcKuGvZU2wIaTvCRnBb2/qR6e+dewUdumtr/ef6Uc3y46p Vuia9eLQOTVefEekBd3czKmOSNTwxtZo+W40/68Y= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 4A8463851C0C for ; Thu, 10 Jun 2021 09:19:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4A8463851C0C Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-581-lZutawj1PFm0QKXi3oB8NA-1; Thu, 10 Jun 2021 05:19:46 -0400 X-MC-Unique: lZutawj1PFm0QKXi3oB8NA-1 Received: by mail-wr1-f69.google.com with SMTP id k25-20020a5d52590000b0290114dee5b660so592191wrc.16 for ; Thu, 10 Jun 2021 02:19:46 -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=wUZBXty5UmlaEOhSAlLeIIh3nO165zzxPWZWZ9KVqoU=; b=Glu9FKKiysA5TGBrJK1D7YGTwyG6yoSmEmLjZ7pGHKXgIaxvioqsFNFvSMzqP4FA6R h9ZjFh+SReT3bTzsCoyEu7+a+mgOG8elaIiIkhdqkGGssrY8nX3IbpZcZfUV9qpyHkFL 2GbrqXA9vtcaEzMks0mg9Xqqyaus/DSmkBLE2Obfi8TIG8PwvsNts0/4wMmcBMy7Xv6s KA+x1SJxhvQLPInNmATJB9V2sUyRAYaI4yoQRI1w/ckAKgXbvBu4n6I8s2L7mXzs1uiA QFDE5UUOm7n8qkF85gMNmGJBZgFFhu/LPnz2rjN1oUihX0Hq4FcizRE1nfg/MLZEyTVJ sRpQ== X-Gm-Message-State: AOAM532vmBvNEGYxeHs+KMbXKCusHW7zkGMbPejxK1dFf+4S811xGI+8 TddHe8hzSS4VIwBRUIC9LiIBlywlIH0cDLA12YM39nFw/nJ1t5aw8XxGZUAq5TBK+qQlcT7vN9B Qm/8awcCXVCl8pSet13TEnmRTZ4g31ZTNu1KN8G4SU8rJ0eKsI+rUVniYSboVKzjjjKLz X-Received: by 2002:a5d:4ac5:: with SMTP id y5mr4344046wrs.18.1623316785584; Thu, 10 Jun 2021 02:19:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMNmuccmeVBm5vZCMX1laEi6wIlgA88HzCaQuqjE6jXfUPS49AEN5v5g3ANLSpz7rmcjWnVA== X-Received: by 2002:a5d:4ac5:: with SMTP id y5mr4344031wrs.18.1623316785391; Thu, 10 Jun 2021 02:19:45 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id j18sm2727512wrw.30.2021.06.10.02.19.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 02:19:45 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 07E625800FF; Thu, 10 Jun 2021 11:19:43 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH, applied] reader: Canonicalizing a type once is enough Organization: Red Hat / France X-Operating-System: Fedora 35 X-URL: http://www.redhat.com Date: Thu, 10 Jun 2021 11:19:43 +0200 Message-ID: <87mtry2i1c.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello, While looking at something else, I noticed that the abixml reader was trying to canonicalize each type twice. Once should be enough. * src/abg-reader.cc (build_type): Don't try to canonicalize the type here because all the sub-routines of this function (which actually build the type) already try to canonicalize it. Signed-off-by: Dodji Seketeli Applied to master. --- src/abg-reader.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/abg-reader.cc b/src/abg-reader.cc index 6d25b690..c0385298 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -5698,7 +5698,6 @@ build_type(read_context& ctxt, } #endif - ctxt.maybe_canonicalize_type(t); return t; }