From patchwork Wed Oct 21 11:08:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 40795 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 9C34739540EF; Wed, 21 Oct 2020 11:08:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C34739540EF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1603278523; bh=W+oHGsa3UZkMOxEbHZo9A876LykE+GfJQo1zYh8iLck=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:Cc:From; b=b+fjaJ3wBg0N5HQltvskGYcDNeujloHh3JBHa2trSM8k2GXrOrh3a1zTszxDqghFb nbtcq6YSyvXuNJXR7gSXOsdZHgVyFqWHwYngqEi7xIPsuFI+B3zbZbFIbZ9VF1XRfk fshpV7tX1mCrc1fe0hqlrebCiQOihkwBLhk8VGb8= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by sourceware.org (Postfix) with ESMTPS id D5C2439540EF for ; Wed, 21 Oct 2020 11:08:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D5C2439540EF Received: by mail-qk1-x749.google.com with SMTP id q15so1390483qkq.23 for ; Wed, 21 Oct 2020 04:08:40 -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=W+oHGsa3UZkMOxEbHZo9A876LykE+GfJQo1zYh8iLck=; b=Nv2aUKIdFTuNS87WsdN+6liCosfJfJz8KALupK6sk26VevJDmveQZF/JgS0dMr/7UA BvfV6O5/RqTBrcaTT2a+TDcpu35PiYTmKA5zDzENOvJVsY2OxFm0oO5OlRuPlZV0fFfc RVWAg1wl9D3nDOD4kHEb2HedqvNECpzLt0DiJXglRlbC+vWhju0Jv20uIGcPke2J3TIA a1Dh4T1PH/LAXuuSzClevfGDfOPXieCZrfZ1axkX+yRkVJfNOrQ4GxSa47iclh5jlByd Tt7y7dFC1WC0wdy5GhrKjAkyUm1Azzc46meaReyug3v1fK2tIkJNrfMJzZ6+7O5js4tK 8TZg== X-Gm-Message-State: AOAM5313fuqb8WEEAKy4dIf+V3Jd6f2UEKHkoeN5/D9MuxAQVb/b37lH TaxCHg5ThWjjTZw+jKunP3835qruza+mlUOfXCX43tWDT0Cm/YHtWEA+IgTlYDz6MVp94TeVDQn iO/t1GZUPkW827Q4c0Kn3pdaCHuSCY54deVJG8aSmWSFTbxL+9t61C0/Y93cLEQqA+Xe6i9c= X-Google-Smtp-Source: ABdhPJzvj/SW1i5TCz/OPHmY5p2EsqEGdQfd5UO+AAtpVdzZw9BJ+FCe4omfnTSf4tdE6TgHdh7jlWF9f9OA0A== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:ad4:4a91:: with SMTP id h17mr2276687qvx.41.1603278520310; Wed, 21 Oct 2020 04:08:40 -0700 (PDT) Date: Wed, 21 Oct 2020 12:08:14 +0100 Message-Id: <20201021110815.4025428-1-maennich@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH 1/3] Stabilise sort of canonical types To: libabigail@sourceware.org X-Spam-Status: No, score=-23.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: Matthias Maennich via Libabigail From: =?utf-8?q?Matthias_M=C3=A4nnich?= Reply-To: Matthias Maennich Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" From: Giuliano Procida Some types like unnamed-enum-underlying-type are not distinguished by type_topo_comp. This can result in nondeterministic output and flakey tests. While a more complete ordering from type_topo_comp would be nice, the nondeterminism can reduced by preserving the relative order of identically-named types. * src/abg-ir.cc (scope_decl::get_sorted_canonical_types): Sort canonical types with std::stable_sort(..., type_topo_comp()). Signed-off-by: Giuliano Procida Reviewed-by: Matthias Maennich Signed-off-by: Matthias Maennich Reviewed-by: Giuliano Procida --- src/abg-ir.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 8c04797f574c..e491528922d3 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -6008,9 +6008,9 @@ scope_decl::get_sorted_canonical_types() const priv_->sorted_canonical_types_.push_back(*e); type_topo_comp comp; - std::sort(priv_->sorted_canonical_types_.begin(), - priv_->sorted_canonical_types_.end(), - comp); + std::stable_sort(priv_->sorted_canonical_types_.begin(), + priv_->sorted_canonical_types_.end(), + comp); } return priv_->sorted_canonical_types_; }