From patchwork Wed Apr 4 07:49:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 894878 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-475807-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="XIyb84d6"; 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 40GJ5m4Y17z9s0m for ; Wed, 4 Apr 2018 17:50:03 +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:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=BEZSo+ITJ4nkh1ikRHOa0j0O3I1yLJLeCipaSzFx6Hyt84GXdXLMd 5XxDr+hpdlkvFY5oAlkUERBn+kLV6An+qa3tkbVAusBe8ZgpBOUt3oQYdA/V7Qoy C+LeRC5DNFqfP9y6cvjgQkReITb+Jvp4MHxj5O69aeQ2IB3ucSDYbk= 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:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=2x27LWhrJeiMBwobd9lNoIYReNE=; b=XIyb84d6APoLe7TMptqP RN1EyZWpWb4kEeq9RkdpjskwRgsMzwKL01U9YXOQupprdJQBIxTq8w6Pmt0jFB/f fvS8FVWib0dv0KVWfyhzP52SEcizuFjfFqFk8qFLnyrQKZGW/viwQkQotz/lEJ3f XzN2ZTzYsYGV9yocmZIJ0jQ= Received: (qmail 1939 invoked by alias); 4 Apr 2018 07:49:57 -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 1924 invoked by uid 89); 4 Apr 2018 07:49:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_NUMSUBJECT, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 04 Apr 2018 07:49:54 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 10869AFEB for ; Wed, 4 Apr 2018 07:49:52 +0000 (UTC) Date: Wed, 4 Apr 2018 09:49:51 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix PR85168 Message-ID: User-Agent: Alpine 2.20 (LSU 67 2015-01-07) MIME-Version: 1.0 The following fixes a bad propagation of abnormals in VN valueization. Bootstrapped and tested on x86_64-unknown-linux-gnu, applied to trunk. Richard. 2018-04-04 Richard Biener PR tree-optimization/85168 * tree-ssa-sccvn.c (vn_reference_maybe_forwprop_address): Avoid propagating abnormals. * gcc.dg/torture/pr85168.c: New testcase. Index: gcc/tree-ssa-sccvn.c =================================================================== --- gcc/tree-ssa-sccvn.c (revision 259024) +++ gcc/tree-ssa-sccvn.c (working copy) @@ -1249,7 +1249,9 @@ vn_reference_maybe_forwprop_address (vec return true; } if (!addr_base - || TREE_CODE (addr_base) != MEM_REF) + || TREE_CODE (addr_base) != MEM_REF + || (TREE_CODE (TREE_OPERAND (addr_base, 0)) == SSA_NAME + && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (TREE_OPERAND (addr_base, 0)))) return false; off += addr_offset; @@ -1262,6 +1264,7 @@ vn_reference_maybe_forwprop_address (vec ptr = gimple_assign_rhs1 (def_stmt); ptroff = gimple_assign_rhs2 (def_stmt); if (TREE_CODE (ptr) != SSA_NAME + || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ptr) || TREE_CODE (ptroff) != INTEGER_CST) return false; Index: gcc/testsuite/gcc.dg/torture/pr85168.c =================================================================== --- gcc/testsuite/gcc.dg/torture/pr85168.c (nonexistent) +++ gcc/testsuite/gcc.dg/torture/pr85168.c (working copy) @@ -0,0 +1,30 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target indirect_jumps } */ + +typedef struct { + struct { + char a; + } b; +} c; + +int d, f; +c *e; + +extern void i(void); +extern void sejtmp () __attribute__((returns_twice)); + +void g(void) +{ + c *h = e; + if (f) + { + i(); + h--; + if (d) + if (h->b.a) + i(); + } + if (h->b.a) + sejtmp(); + e = h; +}