From patchwork Tue Mar 21 00:15:29 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: 9635689 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 DE72A601E9 for ; Tue, 21 Mar 2017 00:16:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D126D26E4F for ; Tue, 21 Mar 2017 00:16:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C60F4275A2; Tue, 21 Mar 2017 00:16:49 +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 73F2826E4F for ; Tue, 21 Mar 2017 00:16:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755839AbdCUAQt (ORCPT ); Mon, 20 Mar 2017 20:16:49 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34929 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755901AbdCUAQs (ORCPT ); Mon, 20 Mar 2017 20:16:48 -0400 Received: by mail-wr0-f193.google.com with SMTP id u108so20435767wrb.2 for ; Mon, 20 Mar 2017 17:16:47 -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=PJj7pRBz3IWzusIm7MATPAzVygOQzRwHjHLnUuuLhEA=; b=Fqm4zT1aI557J1SGOVQhmhVDwN1ExC7MOKoPyOSU73Xr77uhlfq0YGoFZFrlnnS+CH TGIIfeTSWw8xZAVotqdhiHI9uH3wrC375Ib5tTbvUlVpuev9Fjekf8CCJRmcotr1I3A1 cannrvO6b6cR4HzfyCmxOtrWWV6OvGN+hAg7SChj6beiY0UoFmO9IqIFINuiREWDXW4N FDJkkIoOQG1Rep4/xGufuMq3MIoIZmF4Iav4Z51tYRdYks4ndv7nNae5Glh8LAJokrz4 +d7MUFrvDua9+nx/lYUfCjZTjdBq+6FF48QdDGl3EALByDCDhxrIiPJlGkM0tH271Lq+ SzdA== 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=PJj7pRBz3IWzusIm7MATPAzVygOQzRwHjHLnUuuLhEA=; b=JecQDDLCshAMt3I+9I2Qr6r0pcRXRKiGOFKC09flMKHSlWtF1jm0oB1psS2a9xsX94 nMMZMq5UjKUcQ5HWaMB5dTQl4xi5Kuonov/aWlu2vad6iHDijOrJ1oo0UeMlEZDKp7uP M9GERgFhJB1tpveFdFLzKp3F0sccvHD9CtKFyTQ25arFxwO03I2ABKpIhqvnLhAEqQAW fLy65lMsHgKeWHf4t30vkVkRJx72WhU+YQ2RQpYxqEncP72B8aKA85WchQN8Vb9db4FJ SnWBrGxzK4kFJvlUjWox+D+1lGDwFN1GDcF4Hn7tjGbT0b3QYDRQNsUmMuIxi96B+Hwi wmGw== X-Gm-Message-State: AFeK/H2Yk5OnyGgkUVZuN99VhgThbLPP6jqfVXdPc03dcCwyUvvKwsrgecnGaAQrcgU8kA== X-Received: by 10.223.141.148 with SMTP id o20mr29221246wrb.75.1490055406267; Mon, 20 Mar 2017 17:16:46 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:8b8:5c00:403a:a805:fd41:37d2]) by smtp.gmail.com with ESMTPSA id t195sm15271172wmt.32.2017.03.20.17.16.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 17:16:45 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Dibyendu Majumdar , Jeff Garzik , Pekka Enberg , Luc Van Oostenryck Subject: [PATCH v4 25/63] llvm: fix output_op_[ptr]cast() Date: Tue, 21 Mar 2017 01:15:29 +0100 Message-Id: <20170321001607.75169-26-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170321001607.75169-1-luc.vanoostenryck@gmail.com> References: <20170321001607.75169-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..135b9e001 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)) // cast to void* is OP_CAST ... + 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; }