From patchwork Mon Mar 27 21:24:11 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: 9647543 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 988A4601D7 for ; Mon, 27 Mar 2017 21:27:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A1FD1FF28 for ; Mon, 27 Mar 2017 21:27:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EF89205FD; Mon, 27 Mar 2017 21:27:13 +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 2D4001FF28 for ; Mon, 27 Mar 2017 21:27:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752271AbdC0V1N (ORCPT ); Mon, 27 Mar 2017 17:27:13 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35933 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751810AbdC0V1M (ORCPT ); Mon, 27 Mar 2017 17:27:12 -0400 Received: by mail-wr0-f196.google.com with SMTP id u1so17119448wra.3 for ; Mon, 27 Mar 2017 14:27:10 -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=JRhqLw7E+6w8xNDKMsGMdAGA2IMQV4844bFH1qYNCOk=; b=Elug7KgqbnEgpfh/l7d+JzjBN6ZHLJ/P1mE9CsKLtAjsW6sCPv43DlH9B3MmpOxWFe z7gN6n3jGWo9Oz5ZFJ3tO/VZ8T/wjB4QmSwGR50p/VKll0OgSXvPkpxN0xqMaiFZCYXA APVJGmS+9kaNuhDaPzhfsxAjw9lG8swZAxQoS/do9Rl2PLRCIxUUekuuiq5jwOXQ0P2O gnHvmPeq7OBQkrsdaIb47ZU/4Nu65dWd8NfwetzPnr97DxeVEmpCzVxuSof9cqz2nfkR NAgbyaQC0xnEkzcquAlWCpGElKhrsRanuXRm83T46y2UEY0S0AwnMvV5wG3VuwObr4TP 72eg== 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=JRhqLw7E+6w8xNDKMsGMdAGA2IMQV4844bFH1qYNCOk=; b=ADxEv7DcD9XGvC1Q+Z96birhYlqaQgHtECY/iBVpsnkgvt6wE2weVHPfV2LLZDMuzS XyHjP2zs1CkLlTezRXhY4mUlGvY40BDaOw8QP/rhC4JGiWKiRULGAjZcjsYHbXJgxhLp 3P8/W5W7kCAZV76ycurz/+wiNSEWQPCAvDLKUuKAVmDKMzJFFEF3+RzWHhud6H/TomE+ qTIursx0fyf8oDIAIM4Vr38iiVrnrIkQLEFd4ZvbNB+KUay32zugCLpNb+o9Qols4Gy/ DK1NQo7JWqWRk+I0f63Tn6vb5KDls1BzdpzSL6TQ9NDC9uXteYovfSTwsIxBHKefv/0S 8Y2g== X-Gm-Message-State: AFeK/H1teIwIuk8YObVui8f9Wabh5RBoZ9QOUE1FgfYekAquV9cooxvnxjXJ91dEBHg3FA== X-Received: by 10.223.142.245 with SMTP id q108mr16420573wrb.25.1490650030102; Mon, 27 Mar 2017 14:27:10 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 14:27:09 -0700 (PDT) From: Luc Van Oostenryck To: linux-sparse@vger.kernel.org Cc: Christopher Li , Luc Van Oostenryck Subject: [PATCH v6 47/52] llvm: fix get value from non-anonymous symbol Date: Mon, 27 Mar 2017 23:24:11 +0200 Message-Id: <20170327212416.18536-48-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 | 11 ++--------- validation/backend/load-global.c | 21 +++++++++++++++++++++ validation/backend/string-value.c | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+), 9 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 65b859f4b..c1aefc682 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; } @@ -1212,7 +1205,7 @@ static LLVMValueRef output_data(LLVMModuleRef module, struct symbol *sym) initial_value = LLVMConstNull(type); } - name = show_ident(sym->ident); + name = sym->ident ? show_ident(sym->ident) : "" ; data = LLVMAddGlobal(module, LLVMTypeOf(initial_value), name); 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 + */