From patchwork Wed Jul 24 13:45:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1136330 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-505607-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="w5h4arKh"; 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 45txST4Wj4z9s8m for ; Wed, 24 Jul 2019 23:45:43 +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=Ha4BY4kz102OPP/NKYe8wirXXWW5SSsq2voWxQw8k6zHqK56F2wov kCpkrOmdnHG+C/4dXcCsYRoU3ABxGn4PADMfMDlWW7KwZHeiaglYCm3TAcNKikWh JW13LDp8HcmhxtnxbAHvpGKihRIH/JVb0if/72NCadsW4pInndzsmo= 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=mirCdfvahNC+bNTHLZyw5aP+Jkc=; b=w5h4arKhiq/lWafqGt2E aEUPECremdDsaARVeK5yt2msxJWkuO1XLlEMAmM+d+mCCoAGseJ2iGC8Bl6+9vfg 8KRNgM096CGbPf9DdkCR/V2wJ/djD6Ipb2QteFfCv8vScQF1D43SOjpa/bn3LgZ6 PF8rg+xXv280h86lb5yLF/Q= Received: (qmail 81577 invoked by alias); 24 Jul 2019 13:45:35 -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 81490 invoked by uid 89); 24 Jul 2019 13:45:28 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, SPF_PASS autolearn=ham version=3.3.1 spammy= 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; Wed, 24 Jul 2019 13:45:27 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C21FCAF6B for ; Wed, 24 Jul 2019 13:45:18 +0000 (UTC) Date: Wed, 24 Jul 2019 15:45:18 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix PR91236 Message-ID: User-Agent: Alpine 2.20 (LSU 67 2015-01-07) MIME-Version: 1.0 The following fixes a stack corruption and a missed optimization. Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. Richard. 2019-07-24 Richard Biener PR tree-optimization/91236 * tree-ssa-sccvn.c (vn_walk_cb_data::push_partial_def): Fix size of CONSTRUCTOR write. Fix buffer size we pass to native_encode_expr. Index: gcc/tree-ssa-sccvn.c =================================================================== --- gcc/tree-ssa-sccvn.c (revision 273758) +++ gcc/tree-ssa-sccvn.c (working copy) @@ -1818,7 +1870,7 @@ vn_walk_cb_data::push_partial_def (const if (TREE_CODE (pd.rhs) == CONSTRUCTOR) /* Empty CONSTRUCTOR. */ memset (buffer + MAX (0, pd.offset), - 0, MIN ((HOST_WIDE_INT)sizeof (buffer), + 0, MIN ((HOST_WIDE_INT)sizeof (buffer) - MAX (0, pd.offset), pd.size + MIN (0, pd.offset))); else { @@ -1833,7 +1885,7 @@ vn_walk_cb_data::push_partial_def (const pad = GET_MODE_SIZE (mode) - pd.size; } len = native_encode_expr (pd.rhs, buffer + MAX (0, pd.offset), - sizeof (buffer - MAX (0, pd.offset)), + sizeof (buffer) - MAX (0, pd.offset), MAX (0, -pd.offset) + pad); if (len <= 0 || len < (pd.size - MAX (0, -pd.offset))) {