From patchwork Thu May 23 07:23:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 1103858 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-501506-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="GJ1T+PyA"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 458gvz005Kz9s4V for ; Thu, 23 May 2019 17:23:20 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :subject:to:cc:message-id:date:mime-version:content-type; q=dns; s=default; b=dFeYhELizg2CKOhQAlCjMN1Mu5o88YvhucbPMd3ZisOW/XgodN xAlTaUtcxVBITiZdw2C4DNVCey11ss1PjQA0ZNsWWyMlW85lZ03yKMoVfPQc40Ob jehZQMsIf9/H+1V+qRKZxNtf5CRDTp6afNM4YAo8/xk/KvTBgZyiCX3z4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :subject:to:cc:message-id:date:mime-version:content-type; s= default; bh=WSF1QRICdIdXc10G57w8WIaDRfQ=; b=GJ1T+PyARO6j8uBCjTGk BmX8AotDwAD6DOlAh5ywuUIFgCplBatH4EtrBRuqDaJKj/Z2a4iMP6LjjheMMwz9 IiHddmXA44YiLd5Q7T0M2Eu+f6+x9BqSDyZQsJDICk3NM1ybP3OaWXGZ+W8UoTN/ QQSGCy5J5bAAOkwU0dyxATE= Received: (qmail 54542 invoked by alias); 23 May 2019 07:23:13 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 54534 invoked by uid 89); 23 May 2019 07:23:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=instrument X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 23 May 2019 07:23:11 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id B922FAE82; Thu, 23 May 2019 07:23:09 +0000 (UTC) From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH] Do not instrument static target_expr for use-after-scope (PR sanitizer/90570). To: gcc-patches@gcc.gnu.org Cc: Jakub Jelinek Message-ID: <66432be8-aa38-b393-048d-85af9087f4ed@suse.cz> Date: Thu, 23 May 2019 09:23:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 X-IsSubscribed: yes Hi. ASAN should skip TREE_STATIC target expression similarly to gimplify_decl_expr. Patch can bootstrap on x86_64-linux-gnu and survives regression tests. Ready to be installed? Thanks, Martin gcc/ChangeLog: 2019-05-22 Martin Liska PR sanitizer/90570 * gimplify.c (gimplify_target_expr): Skip TREE_STATIC target expression similarly to gimplify_decl_expr. gcc/testsuite/ChangeLog: 2019-05-22 Martin Liska PR sanitizer/90570 * g++.dg/asan/pr90570.C: New test. --- gcc/gimplify.c | 1 + gcc/testsuite/g++.dg/asan/pr90570.C | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 gcc/testsuite/g++.dg/asan/pr90570.C diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 5bacb255ba7..e5713dd4e8c 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -6666,6 +6666,7 @@ gimplify_target_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p) } if (asan_poisoned_variables && DECL_ALIGN (temp) <= MAX_SUPPORTED_STACK_ALIGNMENT + && !TREE_STATIC (temp) && dbg_cnt (asan_use_after_scope) && !gimplify_omp_ctxp) { diff --git a/gcc/testsuite/g++.dg/asan/pr90570.C b/gcc/testsuite/g++.dg/asan/pr90570.C new file mode 100644 index 00000000000..c2366905516 --- /dev/null +++ b/gcc/testsuite/g++.dg/asan/pr90570.C @@ -0,0 +1,18 @@ +/* PR sanitizer/90570 */ +/* { dg-do run } */ + +#include + +struct stru +{ + std::vector v{1,2,3,4}; + int i{5}; +}; + +int main() +{ + stru s1; + stru s2; + + return 0; +}