From patchwork Mon Mar 27 21:23:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 9647511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E62B7601D7 for ; Mon, 27 Mar 2017 21:26:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7FF02840E for ; Mon, 27 Mar 2017 21:26:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCF1028422; Mon, 27 Mar 2017 21:26:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F8E22840E for ; Mon, 27 Mar 2017 21:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752108AbdC0V0z (ORCPT ); Mon, 27 Mar 2017 17:26:55 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:34800 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739AbdC0V0z (ORCPT ); Mon, 27 Mar 2017 17:26:55 -0400 Received: by mail-wr0-f195.google.com with SMTP id w43so14204016wrb.1 for ; Mon, 27 Mar 2017 14:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Dsw1mCET64sE+70ssrl4v6sRMIFk12y/YXY3Cik+Kq8=; b=HPbxXtOaTFp0FWXhuhdz1NHuwF5q5hvx7kZUZrezC1cHKPU9hfMvyllJkSzMOkV5W+ LGDMjzHr09xYb41PxUuh4TwKs1I9bMBZFHGCm/k4avhGhxiHowA97DqmV2VpbX18qIAZ RpzBkkW9T5/RUrn6665xOhq7g51LDbOUElUzxYq7yC77vFhTncdsD8VAuvFK+zyt8Afk zY+c8oZcypsMcfumGpl95xX8emV7dVVvZWnkiINLq94VPi8yQlCGaPOZ6+wUSpP5WxMe 2F48Kl/4dg1mTyPSdkIPkaC/vwWCh8QwHNYbZSy1HY4CFvGHhzhfGzgLnB9WaZxqlPT0 SDkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Dsw1mCET64sE+70ssrl4v6sRMIFk12y/YXY3Cik+Kq8=; b=OkxRmiDDRmTKAtA97fhXqw0TELrHgaP104ra5B+Dwfg/OiGKZS/LjqH4YqFJzJFPva hlGgeISMRjPEzJrFYK6HQl2kkgVraPEmaQKpJu/UtV3ghmpby6xTSvQ0vmMZGsTaoN3F 1ag3UKg1ZIRaJUICTzrdDwIGTXx0dcZTWHWpaaA3rbZRX7mnS/YprPYWjzBYNaj49U/L hdVyneGfj7zWmiYsVe9y9paGA3ZhvOTeOJfEXrZao1R54tiQACmE/gz8+dSpeTBojvkh ovw/vaP7iztKCSv4QkQ4YFFGN4X8cboefBkc9u7NnbH6Xg59rCjaSJ6JZBailRs4z4Gq FvZQ== X-Gm-Message-State: AFeK/H17xruQ89UVyo+/8S+LGsXt+81ug8hm+fxVRtNULCWKnGvK01BMA5tKSrwyk0O9Sw== X-Received: by 10.28.59.8 with SMTP id i8mr11458940wma.27.1490650007870; Mon, 27 Mar 2017 14:26:47 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:802:b00:496:ae63:aebb:a034]) by smtp.gmail.com with ESMTPSA id k203sm973767wmk.4.2017.03.27.14.26.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 14:26:47 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v6 24/52] llvm: fix type in comparison with an address constant Date: Mon, 27 Mar 2017 23:23:48 +0200 Message-Id: <20170327212416.18536-25-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170327212416.18536-1-luc.vanoostenryck@gmail.com> References: <20170327212416.18536-1-luc.vanoostenryck@gmail.com> Sender: linux-sparse-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sparse@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since sparse's constant are typeless comparing a pointer with an address constant lack correct type information. Fix this by casting the constant to the same type as the LHS. Signed-off-by: Luc Van Oostenryck --- sparse-llvm.c | 3 +-- validation/backend/compare-with-null.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 validation/backend/compare-with-null.c diff --git a/sparse-llvm.c b/sparse-llvm.c index 86c57ab33..f81a8c657 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -586,9 +586,8 @@ static void output_op_compare(struct function *fn, struct instruction *insn) char target_name[64]; lhs = pseudo_to_value(fn, insn, insn->src1); - if (insn->src2->type == PSEUDO_VAL) - rhs = LLVMConstInt(LLVMTypeOf(lhs), insn->src2->value, 1); + rhs = constant_value(insn->src2->value, LLVMTypeOf(lhs)); else rhs = pseudo_to_value(fn, insn, insn->src2); diff --git a/validation/backend/compare-with-null.c b/validation/backend/compare-with-null.c new file mode 100644 index 000000000..e23562bc5 --- /dev/null +++ b/validation/backend/compare-with-null.c @@ -0,0 +1,12 @@ +int tstv(void *p) { return !p; } +int cmpv(void *p) { return p == ((void*)0); } + +int tsti(int *p) { return !p; } +int cmpi(int *p) { return p == ((int *)0); } +int cmpx(int *p) { return p == ((void*)0); } + +/* + * check-name: compare-with-null + * check-command: sparsec -Wno-decl -c $file -o tmp.o + * check-output-ignore + */