From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=6XwX=5K=suse.de=rguenther@sourceware.org>
Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29])
	by sourceware.org (Postfix) with ESMTPS id A1AD23858D32
	for <gcc-patches@gcc.gnu.org>; Fri, 13 Jan 2023 09:47:50 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A1AD23858D32
Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de
Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512)
	(No client certificate requested)
	by smtp-out2.suse.de (Postfix) with ESMTPS id 0F89B5D5A5
	for <gcc-patches@gcc.gnu.org>; Fri, 13 Jan 2023 09:47:49 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa;
	t=1673603269; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:
	 mime-version:mime-version:content-type:content-type;
	bh=X8EXsq0GKy4wvKJA6VK+87a5WcD6Kaf6lBEHZt8lO1A=;
	b=RnX9nV36Re3JBNZVOM9FZFG6hKNlX+ekZgZ6x9cw9Zn3ph5vzpq5h0yJmXogKe2a7i1QtL
	MgQyB5zW6DQrA9ZnXh44zjaBiDpozIty6s2CiODqZcG7IPjpo+ymC5fWTPqSnbD4fi9eWk
	RErgt3RZVpdIsUOwezl771h1PkrZ2JY=
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;
	s=susede2_ed25519; t=1673603269;
	h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:
	 mime-version:mime-version:content-type:content-type;
	bh=X8EXsq0GKy4wvKJA6VK+87a5WcD6Kaf6lBEHZt8lO1A=;
	b=NT7KKC/54WXOusRXCsGng/4USr0CiAHbMhsTCd4ufs2bjtA3cseoET9ydjLPg+dIKHlvkE
	DpkBG7/auF+To6CA==
Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512)
	(No client certificate requested)
	by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F0D891358A
	for <gcc-patches@gcc.gnu.org>; Fri, 13 Jan 2023 09:47:48 +0000 (UTC)
Received: from dovecot-director2.suse.de ([192.168.254.65])
	by imap2.suse-dmz.suse.de with ESMTPSA
	id aY2ZOcQowWPrfwAAMHmgww
	(envelope-from <rguenther@suse.de>)
	for <gcc-patches@gcc.gnu.org>; Fri, 13 Jan 2023 09:47:48 +0000
Date: Fri, 13 Jan 2023 10:47:48 +0100 (CET)
From: Richard Biener <rguenther@suse.de>
To: gcc-patches@gcc.gnu.org
Subject: [PATCH] tree-optimization/108387 - ICE with VN handling of x << C
 as x * (1<<C)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Message-Id: <20230113094748.F0D891358A@imap2.suse-dmz.suse.de>
X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
List-Id: <gcc-patches.gcc.gnu.org>

The following fixes unexpected simplification of x << C as
x * (1<<C) to a constant.

Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed.

	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.
---
 gcc/testsuite/gcc.dg/pr108387.c | 13 +++++++++++++
 gcc/tree-ssa-sccvn.cc           |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.dg/pr108387.c

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;
 		}
 	    }
-- 
2.35.3