From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 963203846078 for ; Tue, 1 Jun 2021 07:39:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 963203846078 Received: by mail-wr1-x42f.google.com with SMTP id n4so13170275wrw.3 for ; Tue, 01 Jun 2021 00:39:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=5PvuXcw235bS+tHgDrrnxDA/kTZzYZvCaVPS8KrP0Ok=; b=mHC2IpgqaVi2lfpCZPkNhliZYFg6/NNlEgjrUqBgfrExFPM1JgSpRmOl+lDm2Ij7Ih F2ulz/+8O8nNkdBYU4JFeEKpAhaOTd3QCZ+HW21BEO85/2Svj7EELH4lu1zCtnv8bAPY 0MymhUgWrsOay+2BYfUUS0IampdXtmlMc7O7MQv3CM5G0RBo0reLJTx4OwAo01pa1vBX EOgqkefJ1fHem6xpuDUOH1mTlf5c8Zd6glDLLPEzjBx3fqxNB7RjtcQi4vIlV6tZ0DYl l1HB8ST1XHl+inEhENcB7R8BSEgG3MR9BMKCppJyq17HSMo+j19hBo2Qx04l3ipR3tP7 kyXQ== X-Gm-Message-State: AOAM533jBOXAuOx7tneO/evDMo4ek1SgUfg5dSp+qV4O/i8fHi5yS7+f 3MvnUhHyoa48NSzdpXDZ+kAGfQ1+WlU0CkdyOSClPicX72M= X-Google-Smtp-Source: ABdhPJwCjZY/j0tU8lRjZRNXRYQBoMQiLKuYokD8kB9gYPmHhx4++2aHP6sXQVK22L20GCaYa37kCVjtOdPAd9Xk8l8= X-Received: by 2002:a5d:548b:: with SMTP id h11mr14588963wrv.131.1622533146639; Tue, 01 Jun 2021 00:39:06 -0700 (PDT) MIME-Version: 1.0 References: <20210427112853.1338240-1-gprocida@google.com> <20210527085305.1400592-1-gprocida@google.com> <20210527085305.1400592-2-gprocida@google.com> In-Reply-To: <20210527085305.1400592-2-gprocida@google.com> From: Giuliano Procida Date: Tue, 1 Jun 2021 08:38:54 +0100 Message-ID: Subject: Re: [PATCH v2 1/3] abg-dwarf-reader: create new corpus unconditionally To: Giuliano Procida via Libabigail Cc: Dodji Seketeli , kernel-team@android.com, =?UTF-8?Q?Matthias_M=C3=A4nnich?= X-Spam-Status: No, score=-28.3 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_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 Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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, 01 Jun 2021 07:39:10 -0000 I forgot to add: this addresses bug 27769. On Thu, 27 May 2021, 09:53 Giuliano Procida, wrote: > 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 a06ca88f..135d33c3 100644 > --- a/src/abg-dwarf-reader.cc > +++ b/src/abg-dwarf-reader.cc > @@ -14243,14 +14243,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. > -- > 2.31.1.818.g46aad6cb9e-goog > >