[gcc(refs/users/guojiufu/heads/guojiufu-branch)] Fix bits/bytes confusion in latest change to expand_unop

[Jiu Fu Guo <guojiufu@gcc.gnu.org>]

https://gcc.gnu.org/g:0bd4508f86889995f6864bf50773bd6859951007

commit 0bd4508f86889995f6864bf50773bd6859951007
Author: Eric Botcazou <ebotcazou@gcc.gnu.org>
Date:   Tue Jun 2 13:14:55 2020 +0200

    Fix bits/bytes confusion in latest change to expand_unop
    
    gcc/ChangeLog:
            PR middle-end/95395
            * optabs.c (expand_unop): Fix bits/bytes confusion in latest change.
    
            * tree-pretty-print.c (dump_generic_node) <ARRAY_TYPE>: Print quals.

Diff:
---
 gcc/optabs.c            | 2 +-
 gcc/tree-pretty-print.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gcc/optabs.c b/gcc/optabs.c
index 7a4ec1ec01c..6d0b76c13ba 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -2892,7 +2892,7 @@ expand_unop (machine_mode mode, optab unoptab, rtx op0, rtx target,
 	  /* We do not provide a 128-bit bswap in libgcc so force the use of
 	     a double bswap for 64-bit targets.  */
 	  if (GET_MODE_SIZE (int_mode) == 2 * UNITS_PER_WORD
-	      && (UNITS_PER_WORD == 64
+	      && (UNITS_PER_WORD == 8
 		  || optab_handler (unoptab, word_mode) != CODE_FOR_nothing))
 	    {
 	      temp = expand_doubleword_bswap (mode, op0, target);
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index f04fd65091a..7d581214022 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -1899,8 +1899,16 @@ dump_generic_node (pretty_printer *pp, tree node, int spc, dump_flags_t flags,
 
     case ARRAY_TYPE:
       {
+	unsigned int quals = TYPE_QUALS (node);
 	tree tmp;
 
+	if (quals & TYPE_QUAL_ATOMIC)
+	  pp_string (pp, "atomic ");
+	if (quals & TYPE_QUAL_CONST)
+	  pp_string (pp, "const ");
+	if (quals & TYPE_QUAL_VOLATILE)
+	  pp_string (pp, "volatile ");
+
 	/* Print the innermost component type.  */
 	for (tmp = TREE_TYPE (node); TREE_CODE (tmp) == ARRAY_TYPE;
 	     tmp = TREE_TYPE (tmp))