From patchwork Sun Mar 19 01:42:15 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: 9632403 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 43BBE601E9 for ; Sun, 19 Mar 2017 01:42:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3622D282E8 for ; Sun, 19 Mar 2017 01:42:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B0D628338; Sun, 19 Mar 2017 01:42:58 +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 C7083282E8 for ; Sun, 19 Mar 2017 01:42:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751398AbdCSBm6 (ORCPT ); Sat, 18 Mar 2017 21:42:58 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34297 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751315AbdCSBm5 (ORCPT ); Sat, 18 Mar 2017 21:42:57 -0400 Received: by mail-wr0-f193.google.com with SMTP id u48so13843099wrc.1 for ; Sat, 18 Mar 2017 18:42:56 -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=xZ90sZYXBJlEAwwfbaw4svVWfw+nTNa9cKiAOE2SCc4=; b=hkq+JCdJKDoxbUJD98V81zpqpajgDPq5QMIhAEKqN/BcbXMDLmC1y/uEMoesg5ZBji 2Eg414LUO4JmAOshAFIbAa9GIsimYfSYv367IufcZMAPHMR6FKIguqkMawYbHjyG3Nvm t7rAhiv5lHAGVRI2QcE0NhuTfOsbx/HZ8Ds07WmHb/2HGUc628XoWlsDehlm3bKJpK7E lHRsByXiV2J8hQKx59MeP1m4sWPme8UGTW202Q9dNprwHprsBEHqTqKahytoBr8gTJLT mrvz9MWK7Mor5mio2OrSNPmMTz2Z8ltNMqcik9KH60tM/98KYVzxgeYIMuJ0wggaT6m9 0yjg== 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=xZ90sZYXBJlEAwwfbaw4svVWfw+nTNa9cKiAOE2SCc4=; b=fSmQXkC45roT+T/HpikZba7CxfzjVEyWQnHGd5JdHfosyIOl/CtHgrdo7kyAtR1erk /CJQEa5CljurT4U/rS0d8ZAR2BcmAI07eTHnc1wYlP4uTAkz6D6owFvfn/t7Pw9xnJED A3IBmKrG3hizpywwRF44UFtqJ8q19r4WMwunjSSmo2hh1tr0rfcDFewc9LZ640CWW17z YB5tTgOuyvfC3TTe7sS5EdvuU+7hlMcJPXcA4I4wIO591c3XKf+snKrZDneqPI4c2wxI 4ysNqD/5fydedQTCR3CVBlPL8s2ccEwY5XjwcbD2AuIzd0uAL//2sYcYCiIuda9UUfrz Zrfg== X-Gm-Message-State: AFeK/H36W7B3smvpBvECYg7c5oD1Uv2xqThMQPJnfWIt0WKNdu3O/2Wp1o3qvoBnEK5L3A== X-Received: by 10.223.135.153 with SMTP id b25mr19323653wrb.169.1489887775670; Sat, 18 Mar 2017 18:42:55 -0700 (PDT) Received: from localhost.localdomain (83.254-65-87.adsl-dyn.isp.belgacom.be. [87.65.254.83]) by smtp.gmail.com with ESMTPSA id m139sm10814099wma.2.2017.03.18.18.42.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Mar 2017 18:42:55 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Dibyendu Majumdar , Luc Van Oostenryck Subject: [PATCH v3 18/30] llvm: fix output_op_[ptr]cast() Date: Sun, 19 Mar 2017 02:42:15 +0100 Message-Id: <20170319014227.8833-19-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170319014227.8833-1-luc.vanoostenryck@gmail.com> References: <20170319014227.8833-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 OP_PTRCASTs can't always be directly translated into LLVM bitcasts and OP_[S]CASTs can't always be translated into LLVM's trunc/sext/zext because integer to pointer and pointer to integer must be handled too. Fix this in output_op_ptrcast() & output_op_cast() by issuing LLVMBuildIntToPtr/PtrToInt when appropriate. Reported-by: Dibyendu Majumdar Signed-off-by: Luc Van Oostenryck --- sparse-llvm.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/sparse-llvm.c b/sparse-llvm.c index e01406281..733fc467c 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -792,6 +792,8 @@ static void output_op_phi(struct function *fn, struct instruction *insn) static void output_op_ptrcast(struct function *fn, struct instruction *insn) { LLVMValueRef src, target; + LLVMTypeRef dtype; + LLVMOpcode op; char target_name[64]; src = insn->src->priv; @@ -802,15 +804,31 @@ static void output_op_ptrcast(struct function *fn, struct instruction *insn) assert(!is_float_type(insn->type)); - target = LLVMBuildBitCast(fn->builder, src, insn_symbol_type(insn), target_name); + dtype = insn_symbol_type(insn); + switch (LLVMGetTypeKind(LLVMTypeOf(src))) { + case LLVMPointerTypeKind: + op = LLVMBitCast; + break; + case LLVMIntegerTypeKind: + op = LLVMIntToPtr; + break; + default: + assert(0); + } + target = LLVMBuildCast(fn->builder, op, src, dtype, target_name); insn->target->priv = target; } static void output_op_cast(struct function *fn, struct instruction *insn, LLVMOpcode op) { LLVMValueRef src, target; + LLVMTypeRef dtype; char target_name[64]; + unsigned int width; + + if (is_ptr_type(insn->type)) + return output_op_ptrcast(fn, insn); src = insn->src->priv; if (!src) @@ -820,11 +838,23 @@ static void output_op_cast(struct function *fn, struct instruction *insn, LLVMOp assert(!is_float_type(insn->type)); - if (insn->size < LLVMGetIntTypeWidth(LLVMTypeOf(src))) - target = LLVMBuildTrunc(fn->builder, src, insn_symbol_type(insn), target_name); - else - target = LLVMBuildCast(fn->builder, op, src, insn_symbol_type(insn), target_name); + dtype = insn_symbol_type(insn); + switch (LLVMGetTypeKind(LLVMTypeOf(src))) { + case LLVMPointerTypeKind: + op = LLVMPtrToInt; + break; + case LLVMIntegerTypeKind: + width = LLVMGetIntTypeWidth(LLVMTypeOf(src)); + if (insn->size < width) + op = LLVMTrunc; + else if (insn->size == width) + op = LLVMBitCast; + break; + default: + assert(0); + } + target = LLVMBuildCast(fn->builder, op, src, dtype, target_name); insn->target->priv = target; }