From patchwork Mon Mar 27 21:24:10 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: 9647557 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 80324601D7 for ; Mon, 27 Mar 2017 21:27:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71F241FF28 for ; Mon, 27 Mar 2017 21:27:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6714D205FD; Mon, 27 Mar 2017 21:27:22 +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 18E941FF28 for ; Mon, 27 Mar 2017 21:27:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752633AbdC0V1W (ORCPT ); Mon, 27 Mar 2017 17:27:22 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33691 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752626AbdC0V1V (ORCPT ); Mon, 27 Mar 2017 17:27:21 -0400 Received: by mail-wr0-f195.google.com with SMTP id 20so17045017wrx.0 for ; Mon, 27 Mar 2017 14:27:15 -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=TZBuU/cVvi7Ov+44IFALpE5ixETfnI1ZxYEJV+mPc5w=; b=uGQEbQcvGNrZFAI2/kp4j7EvZsSDtj8UARM04lG4WvAO5OxzNV2KQxpIAN3XU2B4GX zE3rl5S5FIRMX0ym4lU+1mQyH3kgCkHrszJNYQsmr+XCOhPtzaT6MHxbBAHTsMtvCA5u 6kvDnvCQtcZd5BoBj5QZ+rxHTpVhNjUGyjCxBxtuWY1j6pWmdh06a4HWCOltgBiZ0a43 c/J2itvQGTNwJUowUbIRZk32ijmHkftg0VMKX/agoZyjuaNzkWcaH5wWkZejaL1BaDSh tG3j/eEKL5lPMN7Y8pCE9hrFn0qk7HKQVfPrG6qw+RhHu09cM55OgEV3KaxvRtuqy/p1 ogAQ== 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=TZBuU/cVvi7Ov+44IFALpE5ixETfnI1ZxYEJV+mPc5w=; b=mOsQL3rCkI98q+8XjuRzgjEl9V8SNlXlFpwj+zLBoKgT6XXpY2P7WiP/KHn/MOQQRn 3CQk6WhAGrunSjAW+e23okh1bW7jmTjK3GQRQTtnPcSJ7ECbz51TVG98WkvyVsQebNLq cGzMlJixYdUxCsQfh+LQm+kixKWYGjFeqmcVTjFYVusNfyFaKLbENpUjJOQlIuOs1ZTz kNmhXMduwwsfjWJf4uj3tFZA4r2UU2Ipt9FckhpI7+TkmJNBdZWjtOeFBXZ9RKFB188Y gus/P0Q9vupGU7UNJIScLsrUVsTFYCdsegrSr2cRSz68ZXyKkn+vtUSluDCpZRVCOUWn T0kw== X-Gm-Message-State: AFeK/H3hXM5fT7HY4mlMbdGEBYAj/j1rGavL4J5+xQbYWIDFKMXROXCjXwCYEgkrJx9msg== X-Received: by 10.28.232.13 with SMTP id f13mr11524035wmh.141.1490650029203; Mon, 27 Mar 2017 14:27:09 -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.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 14:27:08 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v6 46/52] llvm: fix get value from initialized symbol Date: Mon, 27 Mar 2017 23:24:10 +0200 Message-Id: <20170327212416.18536-47-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 | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/sparse-llvm.c b/sparse-llvm.c index 8b170b4bf..65b859f4b 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;