From patchwork Tue Mar 21 00:16:00 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: 9635761 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 4C46D601E9 for ; Tue, 21 Mar 2017 00:17:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D7BD26E4F for ; Tue, 21 Mar 2017 00:17:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F2CB275A2; Tue, 21 Mar 2017 00:17:39 +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 DAE3A26E4F for ; Tue, 21 Mar 2017 00:17:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755907AbdCUARh (ORCPT ); Mon, 20 Mar 2017 20:17:37 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33908 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755844AbdCUARV (ORCPT ); Mon, 20 Mar 2017 20:17:21 -0400 Received: by mail-wm0-f66.google.com with SMTP id u132so264688wmg.1 for ; Mon, 20 Mar 2017 17:17:20 -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=/BSd71Rij25voDmLqUnRtKqXJT8C16gtrjKqUGYQc7o=; b=QYsMRZbkrQ2xamfx0/sUgf1eNUDiNhHyQYv3XeIHBNU8uJq/824jl4A6+HPpEz4C1E 7H/YXzmNEvcux8ADmg4Z/MiU9lT4BZmYxrZ4nwf8y97Db3mrjMT2ltRalG7oYWcPUJRT I9Fi5fBvYY/HUwOd4bcchKCPhjw3sHHFXK9dYEPqWi6D5N0BeOl3hyx/8s2eJ8rTbKIC qOycVtvnbYjLeXZYTeZJxgBwCNnr+Dy48zKFxS17q0ep6EbO+2/+g7Nbvp81A/+AzgSp v8JKSmnvD2im9/Q0LSVWV8UFvG6d5iKn5T6zr1K9d+gCliNyE6W2I4+P9F6E6gZBiKTb n4Rw== 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=/BSd71Rij25voDmLqUnRtKqXJT8C16gtrjKqUGYQc7o=; b=hccFcy544G4k5TbgHY2lzxqfP03XPN23ZQjqYqM4TJ0JZVMEV80Kl7wO8L8qs+yssO FZWQSrlOFVbCaIgrOvsEX8EX8beAWW5asErFGHws4ZMecksjdhHJapCFepnrJ0l1SYuo QftA3jSeIgpSypiwxS3LRbTQIgKaSebBAuEJwGZ6zpv7RecfOV3Dang3pw0PipMwYzmq 51I7IhacH235iRcIOE/qofEkbwCYZt+j05nK7Nxw4vv3yBlSuRENPgV3nwZtJEEMB+Hj 0jnjHs2KKzGMcOPgpbNXYD5IpxU1AOKznTSpbLdJuQPUSlOmVJ3CPBNMG9qABKXO6n+a QGAQ== X-Gm-Message-State: AFeK/H1u38VpB8JFrGbbKrXAvTA4bvEGFa7r1wKj1NftxejxdobBhkTDovyVjq5Ka2Jq1g== X-Received: by 10.28.71.87 with SMTP id u84mr177658wma.101.1490055439241; Mon, 20 Mar 2017 17:17:19 -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.17.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 17:17:18 -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 56/63] llvm: fix mutated OP_[PTR]CAST Date: Tue, 21 Mar 2017 01:16:00 +0100 Message-Id: <20170321001607.75169-57-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 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 0b711473d..ac0093a3b 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));