From: Richard Biener <rguenther@suse.de>
Date: Tue, 5 Sep 2017 12:58:00 +0000 (+0000)
Subject: re PR c++/82084 (ICE: constructing wstring with -O3)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=54c430044ba9a35a590e591108b184535eba5763;p=gcc.git

re PR c++/82084 (ICE: constructing wstring with -O3)

2017-09-05  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/82084
	* fold-const.c (can_native_encode_string_p): Handle wide characters.

From-SVN: r251711
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5f60fe27690..7f5b384bca4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-05  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/82084
+	* fold-const.c (can_native_encode_string_p): Handle wide characters.
+
 2017-09-05  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/82102
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 490483067ee..0cb2301a518 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -7489,10 +7489,11 @@ can_native_encode_string_p (const_tree expr)
 {
   tree type = TREE_TYPE (expr);
 
-  if (TREE_CODE (type) != ARRAY_TYPE
+  /* Wide-char strings are encoded in target byte-order so native
+     encoding them is trivial.  */
+  if (BITS_PER_UNIT != CHAR_BIT
+      || TREE_CODE (type) != ARRAY_TYPE
       || TREE_CODE (TREE_TYPE (type)) != INTEGER_TYPE
-      || (GET_MODE_BITSIZE (SCALAR_INT_TYPE_MODE (TREE_TYPE (type)))
-	  != BITS_PER_UNIT)
       || !tree_fits_shwi_p (TYPE_SIZE_UNIT (type)))
     return false;
   return true;