From patchwork Mon Mar 27 21:24:08 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: 9647559 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 E6D0B601D7 for ; Mon, 27 Mar 2017 21:27:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8C9F1FF28 for ; Mon, 27 Mar 2017 21:27:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDA61205FD; Mon, 27 Mar 2017 21:27:23 +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 785221FF28 for ; Mon, 27 Mar 2017 21:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626AbdC0V1X (ORCPT ); Mon, 27 Mar 2017 17:27:23 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:35329 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbdC0V1X (ORCPT ); Mon, 27 Mar 2017 17:27:23 -0400 Received: by mail-wr0-f194.google.com with SMTP id p52so14122237wrc.2 for ; Mon, 27 Mar 2017 14:27:08 -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=jIMtr9kBCZjLgBahCGMjSWprq5T+0QhhmnREY3Jta9E=; b=kFQ3XgO+LMgnYJqakVUSgro+lbtPoc/4hLgwJGcxmMSGLBmbbCdohhYep0qUY5pDYk 689Y5ORO3irFYaHQEqzV4UW6jenQlJOKEOOp2QVT4+X+couEzofKmJi2t0hpzd3lq7+U Uf3UOMfXMn7WZDNSsR0uLuPByjw2AqOePfs+swP01HqHfA7mnevt5Ma6OH4nUiHuu7YC WXbbZyM/2KlvybVVfEBOTAvLJaPW+/nh6Kfe5Mfy2DOArNhDloufYriAqlVpFrE3x2tv vjlKISUxuuStZqMnGLZut3WIx5bgX+tetHTyo22HvRzrIBLxinXffPrC5+oGMqrI9r82 0y6Q== 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=jIMtr9kBCZjLgBahCGMjSWprq5T+0QhhmnREY3Jta9E=; b=dGQn2kvk/PMJBgEFAjJXoGNfifwXXoICkALHPCs7CDJIHi+9hoojZMBs9iMEj8DRy+ zqIMFFDltWzPr3QLDQoQKfyBazudjkDPRI7Emln//HbOk6OzPpE5FIlXb0puUeVwNFcS uY5ciRa2vOfK7slf8Pb4JISX92jH14uYthWR0y0/RUYsr3kzdEi0KK2caJfqeZP0JDFg r3k4mDUehvt770X81xcsfbSLUsKvaPHgt9yxQ389F2XWCrMR2roDEX5+9ZNSOKSLXoDK R9S01N3QL2Xi2Y4/k3nB6S/a64BhTgxlOxPDb4PgcduFIDT2sMFgZy4ucTPyd74PrXdl whVw== X-Gm-Message-State: AFeK/H0UavfVtH6R/BWOs5/FJhI46y6VA5jhyyW+I8rVz1gnuyPSPJp1fQpGTD7o5sQZXw== X-Received: by 10.223.145.227 with SMTP id 90mr5160314wri.170.1490650027276; Mon, 27 Mar 2017 14:27:07 -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.27.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 14:27:06 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v6 44/52] llvm: fix mutated OP_[PTR]CAST Date: Mon, 27 Mar 2017 23:24:08 +0200 Message-Id: <20170327212416.18536-45-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 Signed-off-by: Luc Van Oostenryck --- sparse-llvm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sparse-llvm.c b/sparse-llvm.c index 4e9bf930b..cd527eb1c 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -876,13 +876,12 @@ static void output_op_ptrcast(struct function *fn, struct instruction *insn) { LLVMValueRef src, target; LLVMTypeRef dtype; + struct symbol *otype = insn->orig_type; LLVMOpcode op; char target_name[64]; - src = insn->src->priv; - if (!src) - src = pseudo_to_value(fn, insn->type, insn->src); + src = get_operand(fn, otype, insn->src); pseudo_name(insn->target, target_name); assert(!is_float_type(insn->type)); @@ -907,16 +906,15 @@ static void output_op_cast(struct function *fn, struct instruction *insn, LLVMOp { LLVMValueRef src, target; LLVMTypeRef dtype; + struct symbol *otype = insn->orig_type; 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) - src = pseudo_to_value(fn, insn->type, insn->src); + src = get_operand(fn, otype, insn->src); pseudo_name(insn->target, target_name); assert(!is_float_type(insn->type));