From patchwork Fri Sep 18 10:00:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 40420 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 15A8A39450ED; Fri, 18 Sep 2020 10:01:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 15A8A39450ED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1600423261; bh=D0UXOlziT/GlgYUkJQ2Tosi6HMtvxRiV95ic2gVAUow=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:Cc:From; b=BFmhCV7ro7loTWCABlYoU70CsrxF0/ZORd6vy2223Pzgr7k/wV5+Ua/IoM5uPqYic Y9o8+ot5xC8fJPA6I5sYD/kZMfZbaatwVcBYeYdCdfDqMHS7eE8R6QR8NWk4K9y6eQ 355O4q8VvbU8S/JewKMgASkSNm4kSuQr6QHRAWp8= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qv1-xf4a.google.com (mail-qv1-xf4a.google.com [IPv6:2607:f8b0:4864:20::f4a]) by sourceware.org (Postfix) with ESMTPS id F04B63894C3B for ; Fri, 18 Sep 2020 10:00:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F04B63894C3B Received: by mail-qv1-xf4a.google.com with SMTP id w2so3538329qvr.19 for ; Fri, 18 Sep 2020 03:00:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=D0UXOlziT/GlgYUkJQ2Tosi6HMtvxRiV95ic2gVAUow=; b=oGo6In8PlDtjeeZAefvjoswQE12j27/RSyKYCWcy00ZebYQUrqtT7zZhPcMbJlxJZk CdSAF+86SqXS8ZJgMrDyYUd74x47eVppKMz/VZN7cHe5A1Oi5NDFIKdvBptHXh2kcfh2 HyzJ72qdFc7nfgWF26soeNiaqDGozjLcMnxVZX1FiImwSlbnlk/hOe15QPMDxC5lkmNC rkfS21MR5JALcOR5CPk5yy2OKWv83d5n8kPQ8cPaMdpP7lY/9ey7y1TfLMZIIhFG2Lbs lWaUBlGwdC+u7YEvpmXY1W+UUzInW3IDpAgfV5dJ8c3OG39WuCfSdiix2BMlvW3h17oE 7cVg== X-Gm-Message-State: AOAM532nslG2lzKqjXVnBzarZgHDz0NasiJOmbaZGwqkP8Ujb/Mk2GBK 1xaG+eFNmxbH/BaTvxSXm0PEwePq/fFQPRlYyxJcc7kIr9pia/iG7k1k5DY/sBWIb8+UabV2BPa 4LLeZc0RXUFiPFOhaDdyxkRTSt6NPWFc/Sie9rnQRNFFNyi+paflCrgUM/4ztBIj5r+P3eGk= X-Google-Smtp-Source: ABdhPJxrGJrswbiE12DoCk55JOr4yQJ1IZ9GUNP/iNUAC1w0URLCiqNxAuGyIzrxB/himg4txFOk2aLQ73fvFg== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:110:a6ae:11ff:fe11:4f04]) (user=gprocida job=sendgmr) by 2002:ad4:5565:: with SMTP id w5mr31903170qvy.24.1600423258492; Fri, 18 Sep 2020 03:00:58 -0700 (PDT) Date: Fri, 18 Sep 2020 11:00:54 +0100 Message-Id: <20200918100054.505140-1-gprocida@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH] abg-corpus.cc: report architecture discrepancies To: libabigail@sourceware.org X-Spam-Status: No, score=-22.0 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: kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" If there ever is a discrepancy between the architectures of the corpuses of a corpus group, libabigail will just abort with an assertion, if enabled. However, this is a case of invalid input and the cause should be reported to the user. * src/abg-corpus.cc (corpus_group::add_corpus): Report architecture discrepancies. Signed-off-by: Giuliano Procida Reviewed-by: Matthias Maennich --- src/abg-corpus.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc index 1f72904d1..67f878dd6 100644 --- a/src/abg-corpus.cc +++ b/src/abg-corpus.cc @@ -1647,8 +1647,13 @@ corpus_group::add_corpus(const corpus_sptr& corp) corp_arch = corp->get_architecture_name(); if (cur_arch.empty()) set_architecture_name(corp_arch); - else - ABG_ASSERT(cur_arch == corp_arch); + else if (cur_arch != corp_arch) + { + std::cerr << "corpus '" << corp->get_path() << "'" + << " has architecture '" << corp_arch << "'" + << " but expected '" << cur_arch << "'\n"; + ABG_ASSERT_NOT_REACHED; + } priv_->corpora.push_back(corp); corp->set_group(this);