From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 2/3] perf, expr: Remove assert usage
Date: Mon, 23 Sep 2019 16:33:38 -0700 [thread overview]
Message-ID: <20190923233339.25326-2-andi@firstfloor.org> (raw)
In-Reply-To: <20190923233339.25326-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
My "compile perf statically" setup doesn't like this assert
for unknown reasons. Replace it with a standard BUG_ON
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/util/expr.y | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
index f9a20a39b64a..5086a941295a 100644
--- a/tools/perf/util/expr.y
+++ b/tools/perf/util/expr.y
@@ -6,7 +6,6 @@
#define IN_EXPR_Y 1
#include "expr.h"
#include "smt.h"
-#include <assert.h>
#include <string.h>
#define MAXIDLEN 256
@@ -172,7 +171,8 @@ static int expr__lex(YYSTYPE *res, const char **pp)
void expr__add_id(struct parse_ctx *ctx, const char *name, double val)
{
int idx;
- assert(ctx->num_ids < MAX_PARSE_ID);
+
+ BUG_ON(ctx->num_ids >= MAX_PARSE_ID);
idx = ctx->num_ids++;
ctx->ids[idx].name = name;
ctx->ids[idx].val = val;
--
2.21.0
next prev parent reply other threads:[~2019-09-23 23:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 23:33 [PATCH 1/3] perf, evlist: Fix access of freed id arrays Andi Kleen
2019-09-23 23:33 ` Andi Kleen [this message]
2019-09-24 7:44 ` [PATCH 2/3] perf, expr: Remove assert usage Jiri Olsa
2019-09-23 23:33 ` [PATCH 3/3] perf, stat: Fix free memory access / memory leaks in metrics Andi Kleen
2019-09-24 7:50 ` Jiri Olsa
2019-09-24 14:08 ` Andi Kleen
2019-09-24 14:44 ` Jiri Olsa
2019-09-24 19:20 ` Arnaldo Carvalho de Melo
2019-09-24 7:44 ` [PATCH 1/3] perf, evlist: Fix access of freed id arrays Jiri Olsa
2019-09-24 16:05 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190923233339.25326-2-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox