From patchwork Fri Mar 24 23:20:53 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: 9644237 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 B96596020B for ; Fri, 24 Mar 2017 23:24:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB95626530 for ; Fri, 24 Mar 2017 23:24:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A081B27B13; Fri, 24 Mar 2017 23:24:19 +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 50F4526530 for ; Fri, 24 Mar 2017 23:24:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936357AbdCXXYT (ORCPT ); Fri, 24 Mar 2017 19:24:19 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33176 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936122AbdCXXYM (ORCPT ); Fri, 24 Mar 2017 19:24:12 -0400 Received: by mail-wr0-f193.google.com with SMTP id 20so612832wrx.0 for ; Fri, 24 Mar 2017 16:24:11 -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=aGeAz0F8nxiOJ3dP6cdgOAM9Tb0OLVugknJYIXzHqGk=; b=jyj0XKVSUCr+VGA6iEurmkvcTlvbciSmheJgxdZooaSTAQk3WIId6AwFQaeQfXkoTi XQqFzfhmCXJOgnxXk/DRmIjiSBT1+2O84NQleYy4smO2okTz/woEuNBvXt8pZY7GJ+jt EMNxp4uNf2Lj1zC5OrrVWP5pId+Dfb9/Mt8f5ezCfIgsHtzgEXwLSNMmBjkDab4mZrZf ZB1WRK42l5eQCqwEKmA1KJsRtLmwhcjNGbHL7fjCZVZXrMrAeIMRsY567ZzI73/vio3h h0/z+9UyyWQCEXDGmWAcpvx2qtCo0bMAxtmnKvDbVRrlZedITNjhkS/9YJmK0X+r8NJN CJVw== 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=aGeAz0F8nxiOJ3dP6cdgOAM9Tb0OLVugknJYIXzHqGk=; b=Qyq2040yp/0w5UbreirWht1MTL73TXRpNUn5aoT+n8MfyAyguMtK9Wknw9j1UTxNyA cfkaw+F4dmcgWSbD1NGXy+SmdxriPV/sUqnGhJyKh3VvVH3jRNgWZLKwspely/9M1kyW dEStTa0v2bvXJ6mj6eETs4H9QaGXmmmqybNTpCDsqOkFDd8/IknOx1sulqlIjeuDjI6H OSWqWKnm1CgOAlCJlUbZQESHNCKJmNH1FfTB8hLDaVQcvgYs+0adafwfl2U+8sN9EeAv Y6tfs1J+yjjFPcq3v4wlwZ3qYVSMbO8Hztl1ljtXQcEwxYfeOtSSyGO43AqEOmC3azdu btLg== X-Gm-Message-State: AFeK/H1nEE/4xdfInlqpeeIPi9whGZnw46OwQEuNl50NUYs7DAXW//6RR+WepOLenMxKng== X-Received: by 10.223.172.55 with SMTP id v52mr6884896wrc.131.1490397850908; Fri, 24 Mar 2017 16:24:10 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:802:b00:81c3:4cc:f845:762c]) by smtp.gmail.com with ESMTPSA id m188sm4203730wmm.7.2017.03.24.16.24.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Mar 2017 16:24:10 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v5 47/51] llvm: fix get value from non-anonymous symbol Date: Sat, 25 Mar 2017 00:20:53 +0100 Message-Id: <20170324232057.15033-48-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170324232057.15033-1-luc.vanoostenryck@gmail.com> References: <20170324232057.15033-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 | 9 +-------- validation/backend/load-global.c | 21 +++++++++++++++++++++ validation/backend/string-value.c | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 validation/backend/load-global.c create mode 100644 validation/backend/string-value.c diff --git a/sparse-llvm.c b/sparse-llvm.c index 73ca96cce..93237b3d0 100644 --- a/sparse-llvm.c +++ b/sparse-llvm.c @@ -303,7 +303,7 @@ static LLVMValueRef get_sym_value(struct function *fn, struct symbol *sym) assert(sym->bb_target == NULL); expr = sym->initializer; - if (expr) { + if (expr && !sym->ident) { switch (expr->type) { case EXPR_STRING: { const char *s = expr->string->data; @@ -318,13 +318,6 @@ static LLVMValueRef get_sym_value(struct function *fn, struct symbol *sym) result = LLVMConstGEP(data, indices, ARRAY_SIZE(indices)); return result; } - case EXPR_SYMBOL: { - struct symbol *sym = expr->symbol; - - result = LLVMGetNamedGlobal(fn->module, show_ident(sym->ident)); - assert(result != NULL); - break; - } default: break; } diff --git a/validation/backend/load-global.c b/validation/backend/load-global.c new file mode 100644 index 000000000..dedb35f3b --- /dev/null +++ b/validation/backend/load-global.c @@ -0,0 +1,21 @@ +const char *s = "abc"; +int x = 4; +int y; + +int *p = &x; +int *q; + +int loadn(void) { return y; } +int loadi(void) { return x; } + +const char *loads(void) { return s; } + +int *retpn(void) { return q; } +int loadpn(void) { return *q; } +int *retpi(void) { return p; } +int loadpi(void) { return *p; } + +/* + * check-name: use simple value from global vars + * check-command: ./sparsec -Wno-decl -c $file -o tmp.o + */ diff --git a/validation/backend/string-value.c b/validation/backend/string-value.c new file mode 100644 index 000000000..8cdec4a2d --- /dev/null +++ b/validation/backend/string-value.c @@ -0,0 +1,21 @@ +extern void use(const char *); + +const char *ret(void) +{ + return "abc"; +} + +const char *add(void) +{ + return "def" + 1; +} + +void call(void) +{ + use("ijk"); +} + +/* + * check-name: string-value + * check-command: ./sparsec -Wno-decl -c $file -o tmp.o + */