From patchwork Tue Mar 21 00:16:02 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: 9635749 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 A7F4A601E9 for ; Tue, 21 Mar 2017 00:17:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A4E326E4F for ; Tue, 21 Mar 2017 00:17:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F1832780C; Tue, 21 Mar 2017 00:17:31 +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 31DD626E4F for ; Tue, 21 Mar 2017 00:17:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756010AbdCUARY (ORCPT ); Mon, 20 Mar 2017 20:17:24 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33368 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756075AbdCUARX (ORCPT ); Mon, 20 Mar 2017 20:17:23 -0400 Received: by mail-wm0-f67.google.com with SMTP id n11so269465wma.0 for ; Mon, 20 Mar 2017 17:17:22 -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=PdCXVLNCdrNdp5T4ZmN82uhPRUNRQGK8a+JUWJp+n1Y=; b=UmWm9iJv/Rd/XoVq4My1SSgSKddtnpIB76Zh7/gBfG4ja/0FEB6rgUAIoH2r/ZizdE H3szWfzJHpS9cjL3idssSI+A2sztxlLHEWOpsMVvA7ScGwz4RqoiqJz02BLvQYnNQFfP BsW0u3ICA796O4IbgUHawxY2AtQUsD+jZGoPYs+p32XkavAew8PCT12bvM45qapVRkv9 rREtifv9T/lM9+BDtptjwKMUY+TADpDPPAT9RWfSL1jch/Xj5ZRPY+0oNEdICjD/jN1/ IPOPHhQ1CkIN04BPessOv2oAcVZxFMhYQes9X7NAfRDIIGEFzMZgsuRrQL2GiQCfuXfD svtw== 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=PdCXVLNCdrNdp5T4ZmN82uhPRUNRQGK8a+JUWJp+n1Y=; b=ga9yuSoHU57pZIPYZx4PjJdKQ8EFbQnrl3HAxR9/leKXnEdAHsbsQScuOKiPUwnbCM vM/flNL7IApgbAptGwODoFXvOsl1vyq6K0NT/J19Rpu9+zq0c5OIJDCCiSnJ2Fp4wsgu Sd7fkuIv+l94DAoumHTwWiL/+Z5xLpreQiReoB5ZFac+KFKRZ/1XXPI3gz0zELJTYEtk 3//XH5gTbu3bb5JBAmhJfQ+uPUKdknXwFqdTwxRbu2IdeOhXJKgnI8347KBftMlagYp5 QlEZuiiOpw1inU6uxKWcSU2c/SmADhV/wHSY7R7x5r+9g9zs7kEddyKRLpt5KSWUtQbb oKOw== X-Gm-Message-State: AFeK/H1nsvxB3P7ajhlaEHFbjRKMu3yQ9WNuxNEb0U0dqcumtQe8WIXUQVqleVeJxR8B+Q== X-Received: by 10.28.11.130 with SMTP id 124mr205596wml.3.1490055441337; Mon, 20 Mar 2017 17:17:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 17:17:20 -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 58/63] llvm: fix get value from initialized symbol Date: Tue, 21 Mar 2017 01:16:02 +0100 Message-Id: <20170321001607.75169-59-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 | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/sparse-llvm.c b/sparse-llvm.c index 6e6d49bf2..73ca96cce 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -295,6 +295,8 @@ static const char *pseudo_name(pseudo_t pseudo, char *buf) static LLVMValueRef get_sym_value(struct function *fn, struct symbol *sym) { + const char *name = show_ident(sym->ident); + LLVMTypeRef type = symbol_type(sym); LLVMValueRef result = NULL; struct expression *expr; @@ -314,7 +316,7 @@ static LLVMValueRef get_sym_value(struct function *fn, struct symbol *sym) LLVMSetInitializer(data, LLVMConstString(strdup(s), strlen(s) + 1, true)); result = LLVMConstGEP(data, indices, ARRAY_SIZE(indices)); - break; + return result; } case EXPR_SYMBOL: { struct symbol *sym = expr->symbol; @@ -324,21 +326,18 @@ static LLVMValueRef get_sym_value(struct function *fn, struct symbol *sym) break; } default: - assert(0); + break; } - } else { - const char *name = show_ident(sym->ident); - LLVMTypeRef type = symbol_type(sym); + } - if (LLVMGetTypeKind(type) == LLVMFunctionTypeKind) { - result = LLVMGetNamedFunction(fn->module, name); - if (!result) - result = LLVMAddFunction(fn->module, name, type); - } else { - result = LLVMGetNamedGlobal(fn->module, name); - if (!result) - result = LLVMAddGlobal(fn->module, type, name); - } + if (LLVMGetTypeKind(type) == LLVMFunctionTypeKind) { + result = LLVMGetNamedFunction(fn->module, name); + if (!result) + result = LLVMAddFunction(fn->module, name, type); + } else { + result = LLVMGetNamedGlobal(fn->module, name); + if (!result) + result = LLVMAddGlobal(fn->module, type, name); } return result;