From patchwork Wed Jul 15 08:17:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 40100 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 DDDE23875419; Wed, 15 Jul 2020 08:17:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DDDE23875419 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594801075; bh=FKSrHf4dlENFuNKJzgCW5gugKbn2UoDhZ93NQ0cDxcI=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:Cc:From; b=pDk3bt2uh8Bg4hzpXZojppNCmDzgl7k0g6hpH79sdeVZdOvtTiw+JpuUL8BPbulw3 ig5S7wy2LsgibFiI4Pz6rEHmwU9SThZBoxoa7N5i768MGJ6q1ZRDzHwSkMQCcUjRJj CU3cw6566ltzBhBErFu/WOkFRf2tgryna7hMquJA= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wm1-x349.google.com (mail-wm1-x349.google.com [IPv6:2a00:1450:4864:20::349]) by sourceware.org (Postfix) with ESMTPS id 893013875467 for ; Wed, 15 Jul 2020 08:17:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 893013875467 Received: by mail-wm1-x349.google.com with SMTP id o13so317127wmh.9 for ; Wed, 15 Jul 2020 01:17:53 -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:message-id:mime-version:subject:from:to:cc; bh=FKSrHf4dlENFuNKJzgCW5gugKbn2UoDhZ93NQ0cDxcI=; b=RvyrMRaJHutKob2PM9sOEZKUR5qxMyL8Z3qobVrvuBXHw0jGBk5D1Gn2cFXHrWQH13 lriGTCy13YDm9WHLc1W3srxCFZ4ghAvlmRtS6q8yyUmiLZ5/L0EFyK3JRC8O9Ki2D/ef G8xWk2yt7iWoX0TmgHpFFhLBwXk9qK2Tnj9WqU+vzSccji+lK/6UUSjbHCzXtiu6lVq4 8ASVgwzJpm2vlBQYWoAYLBTyoyJsku1JIdjEMuM48Srcm5DyVLMzPE5yKi0xOU9TtchO Dhv5Ceq1LCDqr4ixsCARaTwmKQVd7d0sPufJrjlsjvzkqRLA6umqDcBhTXRab1RUPxlV 8TkA== X-Gm-Message-State: AOAM530y6I4/FdjwSzMbAuUsUg1Rv5NNhAs6625Ijamj+EcLahRBXSDO g8yqhXAgHNDSNcnbVvxtjH9aNdTq68K+Ezcd1Pbe95JEspZ6cBwXy0YcnjhWyfNwouRwFKwCY0J vd9gAsIkqcrazq1o5OVQ5WMhu3cUKcRMzTeL0usMm73d68YYq17V3YjD+SvdlmxIMJ0xNLt8= X-Google-Smtp-Source: ABdhPJyuEY7ofM77Z065sx0u3mTV1s6pNCYaL06R46ARQ5+WIm4hdEZlb1qhJn9hpDvePOgJpn3quz7BeMgpzA== X-Received: by 2002:a1c:398b:: with SMTP id g133mr7273592wma.76.1594801072409; Wed, 15 Jul 2020 01:17:52 -0700 (PDT) Date: Wed, 15 Jul 2020 09:17:46 +0100 Message-Id: <20200715081746.2079442-1-gprocida@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.27.0.389.gc38d7665816-goog Subject: [PATCH] abg-ir.cc: Fix incorrect pop of compared types. To: libabigail@sourceware.org X-Spam-Status: No, score=-23.3 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" In one case there is an attempt to "pop" an in-progress type comparison which hasn't actually happened. This commit fixes this. * src/abg-ir.cc (equals): In the class_or_union overload, replace one instance of RETURN(false) with return false. Signed-off-by: Giuliano Procida --- src/abg-ir.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 757605f8..6040e1d7 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -19380,7 +19380,7 @@ equals(const class_or_union& l, const class_or_union& r, change_kind* k) { if (k) *k |= LOCAL_TYPE_CHANGE_KIND; - RETURN(false); + return false; } if (types_defined_same_linux_kernel_corpus_public(l, r))