From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <rguenth@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1666)
	id 6AC8B3854811; Fri, 13 Jan 2023 09:48:12 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6AC8B3854811
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1673603292;
	bh=F4Aj98eJn3wT/ct16UStfQiaT/L5mOsaqpcZPXR3b20=;
	h=From:To:Subject:Date:From;
	b=j+ztm/i9tShsoD4Dm6KTMhP4ReCCf8lqtIs4i8XYqOL9qH9EH9alKTJPWYuVaXgfs
	 HmzRhB+tpBFMEjVmh3wfSgshu1xF131VjSSXlUZR9v9/fTV8eTqKjD3eERzHuP3i4P
	 u+OA/dYr7YtiPRZ5yrb3wSZg2faS2wc+rmh/iknk=
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Richard Biener <rguenth@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-5136] tree-optimization/108387 - ICE with VN handling of x
 << C as x * (1<<C)
X-Act-Checkin: gcc
X-Git-Author: Richard Biener <rguenther@suse.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 9b6c624820050cd5e11b2fbd9c997f94b691295a
X-Git-Newrev: adbee4a197c7b735a3dd58cfac8933f70069f71d
Message-Id: <20230113094812.6AC8B3854811@sourceware.org>
Date: Fri, 13 Jan 2023 09:48:12 +0000 (GMT)
List-Id: <gcc-cvs.sourceware.org>

https://gcc.gnu.org/g:adbee4a197c7b735a3dd58cfac8933f70069f71d

commit r13-5136-gadbee4a197c7b735a3dd58cfac8933f70069f71d
Author: Richard Biener <rguenther@suse.de>
Date:   Fri Jan 13 08:37:24 2023 +0100

    tree-optimization/108387 - ICE with VN handling of x << C as x * (1<<C)
    
    The following fixes unexpected simplification of x << C as
    x * (1<<C) to a constant.
    
            PR tree-optimization/108387
            * tree-ssa-sccvn.cc (visit_nary_op): Check for SSA_NAME
            value before inserting expression into the tables.
    
            * gcc.dg/pr108387.c: New testcase.

Diff:
---
 gcc/testsuite/gcc.dg/pr108387.c | 13 +++++++++++++
 gcc/tree-ssa-sccvn.cc           |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/gcc.dg/pr108387.c b/gcc/testsuite/gcc.dg/pr108387.c
new file mode 100644
index 00000000000..114186b6c5d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr108387.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fno-tree-ccp" } */
+
+void bar2 (unsigned char, unsigned char);
+
+void
+foo1 (char c)
+{
+  unsigned char t = c;
+  t *= 2;
+  unsigned char t1 = t << 7;
+  bar2 (t, t1);
+}
diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc
index a01022b0d12..0dba3f39aa0 100644
--- a/gcc/tree-ssa-sccvn.cc
+++ b/gcc/tree-ssa-sccvn.cc
@@ -5405,7 +5405,8 @@ visit_nary_op (tree lhs, gassign *stmt)
 	      if (result)
 		{
 		  bool changed = set_ssa_val_to (lhs, result);
-		  vn_nary_op_insert_stmt (stmt, result);
+		  if (TREE_CODE (result) == SSA_NAME)
+		    vn_nary_op_insert_stmt (stmt, result);
 		  return changed;
 		}
 	    }