From patchwork Tue Apr 27 11:28:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 43162 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 5FD2F3833036; Tue, 27 Apr 2021 11:29:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5FD2F3833036 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1619522948; bh=MBDFEsss3eGN/rxgueCKaaIzUwyJIE3KY/DRGaosxBs=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=KfS/hlKKn8PLxrNNH7zrS1E6KPMRdzpjdHrE/W2TipIYwk7+ZBinsxcB+oFI6tgGr eSnc3/1xf/VIo2BzLWViFnoFiKsoHJstOvK6NeTTTS6zj8u111od4C2m+tx1LU96EG 4/tWd+T26bah4czqzfmhgMcNIHag7oN5oTaO+yDA= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org 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 9ADA43894C05 for ; Tue, 27 Apr 2021 11:29:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9ADA43894C05 Received: by mail-ed1-x549.google.com with SMTP id w14-20020aa7da4e0000b02903834aeed684so22966545eds.13 for ; Tue, 27 Apr 2021 04:29:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=MBDFEsss3eGN/rxgueCKaaIzUwyJIE3KY/DRGaosxBs=; b=nQMA/OixUMAAfZagnO4J/Y+8YCuRLdLipGKFm5kdRsHKzKDt04eM6JcKWwQmbLjOnr 16TAvv674xX9gJdTmeVPbPQdclToNp3WHbsRsd6H2ozFAN8/Lytme3/QPaBdbA1fhG8f DZf/NgGdMzR9xyeTRrEjVfWvil4wQli1uipVjzx98t8r+ghUg2KTWAIpbPcfNa6FHbFw zDmQaq/nCe94EbD3ttO7SzB8/RBiP6zHzFkeSnyRv5Hc8OzS98hNBuTcVhE9JBYfelih edo5NAaQ4GWPX09rOxu3Cybhg9YNFDlkLBJzohES6tWcMNcqWA6vAX5JShBia6iI2r+7 s8vg== X-Gm-Message-State: AOAM533qpSSNhjnnxZy/4y7oL+nQYwIM2QU837PMpEbzGggVcKAu8dUW ts2QCY1E0lMx2MTHHHBkDQuajjYfCQNZnVrx+O3YCyC5bnJolFavmcgA/CCb4ZDA86e7XTGx59p IJCt8ZnDBFtOxDgnHr18DuhTaX/cTjevEwLsyHiwlm4bc5KC1zcK5gzfY9B3ERY/JEIGYxqA= X-Google-Smtp-Source: ABdhPJwM89GqGPMztNRapMYj1+Qc2rEq0XENSpU4liYlMhToJuwgoog/582p+tLnKL3sJmQnamYRaaoLePCNYA== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:110:a94:13c5:d1bb:c50d]) (user=gprocida job=sendgmr) by 2002:a05:6402:1a:: with SMTP id d26mr3727629edu.99.1619522945032; Tue, 27 Apr 2021 04:29:05 -0700 (PDT) Date: Tue, 27 Apr 2021 12:28:51 +0100 In-Reply-To: <20210427112853.1338240-1-gprocida@google.com> Message-Id: <20210427112853.1338240-2-gprocida@google.com> Mime-Version: 1.0 References: <20210427112853.1338240-1-gprocida@google.com> X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog Subject: [PATCH 1/3] abg-dwarf-reader: create new corpus unconditionally To: libabigail@sourceware.org X-Spam-Status: No, score=-22.2 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.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: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" The DWARF reader appears to create a new corpus object only if one is not already present. However, the only case where there can be multiple corpora is when build_corpus_group_from_kernel_dist_under is called and this function clears down the reader context, including the current corpus, between reading ELF objects. So it's clearer to just create a fresh corpus object unconditionally in the DWARF reader. * src/abg-dwarf-reader.cc (read_debug_info_into_corpus): Create new corpus object unconditionally. Signed-off-by: Giuliano Procida --- src/abg-dwarf-reader.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index dd9d689c..28d1c73a 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -14233,14 +14233,7 @@ static corpus_sptr read_debug_info_into_corpus(read_context& ctxt) { ctxt.clear_per_corpus_data(); - - if (!ctxt.current_corpus()) - { - corpus_sptr corp (new corpus(ctxt.env(), ctxt.elf_path())); - ctxt.current_corpus(corp); - if (!ctxt.env()) - ctxt.env(corp->get_environment()); - } + ctxt.current_corpus(std::make_shared(ctxt.env(), ctxt.elf_path())); // First set some mundane properties of the corpus gathered from // ELF.