Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08BB4C54E94 for ; Tue, 24 Jan 2023 06:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232559AbjAXGd6 (ORCPT ); Tue, 24 Jan 2023 01:33:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232854AbjAXGdt (ORCPT ); Tue, 24 Jan 2023 01:33:49 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E36E1718 for ; Mon, 23 Jan 2023 22:33:40 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id r8-20020a252b08000000b007b989d5e105so15390337ybr.11 for ; Mon, 23 Jan 2023 22:33:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Hrci0aclnx4SG+PNpXqw0jPdCljnIUPBJgDYHtxS7o0=; b=Hq3ZVOfWgQqRxIWOB+4FxzvfjRtmy1GopQXMkZsA+8+YeJ4Kyn9Q2gtCQyXTsDrqSA GDlfFRdm9ok8WRhvj7gZXRmLB2QS21ITqQCXHZd+DRlzxXHEF3oIupQ+Zi31Hx7hTcgP s+cEiozK6W2l20afcqO/w9AFEFT+t0fM3XuR2PURu1RpwCbUqe/hzjWRkN3cpxH6pHq4 45/mp5qA9LnQrQNZGSH6joiDY2pmW/0U/qIiqM7m5CU4W/pzWRQx5KHHzxxYS9pAnvsH ugUG1ti08N9rx/um64P55QJ5chI/hwwrRDeIA6hZVKYy+7uM0D2WKbeJxU5NXP7jaN0u RwOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Hrci0aclnx4SG+PNpXqw0jPdCljnIUPBJgDYHtxS7o0=; b=Nsc9cJn4kGaxphhscVJgf6BEFru8wgWrGjjmKthheI69yVO4MtTZKoCZfTaB15PRiq iq2YgusRhKW0Yt85e2LVvLUeyGhS2wTEn5SSS39tzrmGhYo49Z+kzfaZ34anuN1ZyBFt egH+LwHhZVz8QORlcyrqAvcpdB6B4T3jIST8KX22pGk5TqOkb0yxg1OF+8ohCAaGoxKj A6G0FM/reUoBlMhfqh749+r26867zIYnyZ+FtnPVJzNT78O/7QgKLiy/dyUrddmW5KJq KnNWuFQxAYRp96YrIvPH1wMlMNCe0U3wi/hxxzgNiU5EEdWRSRhnq/eyCcemAxQ8kCvZ Rwuw== X-Gm-Message-State: AFqh2ko/6rmRAMQoFOdfzDXgZV9v1G3ujw1uZoBtr2Ko7KzBcznNmUvA zxmbjFswTv9g6WCQCyeoa1WBfs3xwLLI X-Google-Smtp-Source: AMrXdXu/x9zI4gILr9Z+vr39HcNqbhqNUx4RCSSwOXbXohCgJM662wC7GgX3/GUniaakconhQSEM2n5yKhzP X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:460d:1b4a:acb8:ae9a]) (user=irogers job=sendgmr) by 2002:a0d:fe03:0:b0:470:533:cb89 with SMTP id o3-20020a0dfe03000000b004700533cb89mr3590620ywf.81.1674542019513; Mon, 23 Jan 2023 22:33:39 -0800 (PST) Date: Mon, 23 Jan 2023 22:33:10 -0800 In-Reply-To: <20230124063320.668917-1-irogers@google.com> Message-Id: <20230124063320.668917-2-irogers@google.com> Mime-Version: 1.0 References: <20230124063320.668917-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.246.g2a6d74b583-goog Subject: [PATCH v3 01/11] perf jevents metric: Correct Function equality From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Kim Phillips , Florian Fischer , Ravi Bangoria , Xing Zhengjun , Rob Herring , Kang Minchul , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Sandipan Das , Jing Zhang , linuxppc-dev@lists.ozlabs.org, Kajol Jain Cc: Stephane Eranian , Perry Taylor , Caleb Biggers , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org rhs may not be defined, say for source_count, so add a guard. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/metric.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric.py index 4797ed4fd817..2f2fd220e843 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -261,8 +261,10 @@ class Function(Expression): def Equals(self, other: Expression) -> bool: if isinstance(other, Function): - return self.fn == other.fn and self.lhs.Equals( - other.lhs) and self.rhs.Equals(other.rhs) + result = self.fn == other.fn and self.lhs.Equals(other.lhs) + if self.rhs: + result = result and self.rhs.Equals(other.rhs) + return result return False -- 2.39.0.246.g2a6d74b583-goog